Merge "Ensure requestTetheredInterface() is processed before proceeding" into main

This commit is contained in:
Patrick Rohr 2025-05-22 10:28:00 -07:00 • committed by Android (Google) Code Review
commit d3295c8747

View file

@ -618,7 +618,12 @@ class EthernetManagerTest {
// see aosp/2123900.
try {
// assumeException does not exist.
requestTetheredInterface().expectOnAvailable(NO_CALLBACK_TIMEOUT_MS)
val listener = requestTetheredInterface()
// Force requestTetheredInterface() to be processed before proceeding by calling
// setEthernetEnabled() which always waits on a callback and is guaranteed to be
// processed after requestTetheredInterface().
setEthernetEnabled(ethernetEnabled)
listener.expectOnAvailable(0)
// interface used for tethering is available, throw an assumption error.
assumeTrue(false)
} catch (e: TimeoutException) {