commit cab97196d609e7abf06b0f6906f4b5004749b233
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 06 09:12:16 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 06 09:12:16 2025 -0800
tree a8dd4ee894e9324bf069c820aa4521c1a9b41109
parent 6010c1d4e375c2d16b7ced6100809518f9ff6f96
parent a1b788e9ec72b96248ae9c7d61d37b84bcb8f6d1

Merge "Prevent calling requestTetheredInterface when using adb over ethernet" into main

tests/cts/net/src/android/net/cts/EthernetManagerTest.kt

diff --git a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
index 57bc2be..06f2075 100644
--- a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
@@ -605,6 +605,9 @@
     }
 
     private fun assumeNoInterfaceForTetheringAvailable() {
+         // Requesting a tethered interface will stop IpClient. Prevent it from doing so
+         // if adb is connected over ethernet.
+         assumeFalse(isAdbOverEthernet())
         // Interfaces that have configured NetworkCapabilities will never be used for tethering,
         // see aosp/2123900.
         try {