commit cf71e324f3727d92245bc9617d9a9dba68e3276c
author Weilun Du <wdu@google.com> Wed Mar 20 03:57:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 20 03:57:27 2024 +0000
tree 7fe847bb4a14456fc692429728a92c305dbb0f52
parent a404348bf3ff941e1ca3c463a2e86b9e5dafb98f
parent 2881157a6d8a078f391ed79e7e37c446fc56a968

Merge "[EthernetTetheringTest] Don't run setupOnce() if Ethernet is not supported." into main

Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java

diff --git a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
index 1022b06..f696885 100644
--- a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
+++ b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
@@ -176,6 +176,7 @@
         // tests, turn tethering on and off before running them.
         MyTetheringEventCallback callback = null;
         TestNetworkInterface testIface = null;
+        assumeTrue(sEm != null);
         try {
             // If the physical ethernet interface is available, do nothing.
             if (isInterfaceForTetheringAvailable()) return;