LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "ethernet: Wait on releaseTetheredInterface() to be processed" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-29 19:55:08 +00:00
committed by Gerrit Code Review
parent fca4ee4f08 524256d457
commit bf6f5b576d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
View File

@@ -385,6 +385,9 @@ class EthernetManagerTest {
} }
registeredCallbacks.forEach { cm.unregisterNetworkCallback(it) } registeredCallbacks.forEach { cm.unregisterNetworkCallback(it) }
releaseTetheredInterface() releaseTetheredInterface()
// Force releaseTetheredInterface() to be processed before starting the next test by calling
// setEthernetEnabled(true) which always waits on a callback.
setEthernetEnabled(true)
} }
// Setting the carrier up / down relies on TUNSETCARRIER which was added in kernel version 5.0. // Setting the carrier up / down relies on TUNSETCARRIER which was added in kernel version 5.0.
@@ -635,6 +638,9 @@ class EthernetManagerTest {
// do nothing -- the TimeoutException indicates that no interface is available for // do nothing -- the TimeoutException indicates that no interface is available for
// tethering. // tethering.
releaseTetheredInterface() releaseTetheredInterface()
// Force releaseTetheredInterface() to be processed before proceeding by calling
// setEthernetEnabled(true) which always waits on a callback.
setEthernetEnabled(true)
} }
} }