joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Move call to setEthernetEnabled inside setIncludeTestInterfaces

Browse source 
setIncludeTestInterfaces() pretty much always requires a call to
setEthernetEnabled(currentState) afterwards as a synchronization
mechanism. Add this call directly inside the helper function for
simplicity.

Test: TH
Flag: EXEMPT mainline
Change-Id: I4c787e9c560ffe60c981ac2e2a730e96138707cb
This commit is contained in:
Patrick Rohr 2025-07-23 10:55:07 -07:00
commit e9d1d080db
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
View file

@ -467,6 +467,9 @@ class EthernetManagerTest {
runAsShell(NETWORK_SETTINGS) {
em.setIncludeTestInterfaces(value)
}
// Wait for the call to be processed by calling setEthernetEnabled() which waits on a
// completion callback.
setEthernetEnabled(ethernetEnabled)
}
private fun removeInterface(iface: EthernetTestInterface) {
@ -710,18 +713,15 @@ class EthernetManagerTest {
val iface2 = createInterface()
val iface3 = createInterface()
// Prevent test interfaces from being tracked and wait for the call to be processed by
// calling setEthernetEnabled() which waits on a completion callback.
// Prevent test interfaces from being tracked.
setIncludeTestInterfaces(false)
setEthernetEnabled(true)
val listener = EthernetStateListener()
addInterfaceStateListener(listener)
listener.assertNoCallback()
// Include test interfaces again, and ensure that they are tracked properly.
// Include test interfaces again.
setIncludeTestInterfaces(true)
setEthernetEnabled(true)
listener.expectCallback(iface1, STATE_LINK_UP, ROLE_CLIENT)
listener.expectCallback(iface2, STATE_LINK_UP, ROLE_CLIENT)