commit df41b36fc905d455b0c9172621fcc09b472b8ec6
author Mark Chien <markchien@google.com> Tue Jul 04 09:12:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 04 09:12:34 2023 +0000
tree 766494e7c658aa262cc6993f4c4ae733110593f5
parent 537451ea67a5d1c0708a3a1159eac500b0d1fddb
parent dc581e6c8ff1a5b956ba41b2eb1fcdc7a11e1e65

Merge "Don't run EthernetTetheringTest if Ethernet is not supported"

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 9162546..9dad301 100644
--- a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
+++ b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
@@ -167,13 +167,18 @@
         mHandlerThread.start();
         mHandler = new Handler(mHandlerThread.getLooper());
 
-        mRunTests = runAsShell(NETWORK_SETTINGS, TETHER_PRIVILEGED, () ->
-                mTm.isTetheringSupported());
+        mRunTests = isEthernetTetheringSupported();
         assumeTrue(mRunTests);
 
         mTetheredInterfaceRequester = new TetheredInterfaceRequester(mHandler, mEm);
     }
 
+    private boolean isEthernetTetheringSupported() throws Exception {
+        if (mEm == null) return false;
+
+        return runAsShell(NETWORK_SETTINGS, TETHER_PRIVILEGED, () -> mTm.isTetheringSupported());
+    }
+
     protected void maybeStopTapPacketReader(final TapPacketReader tapPacketReader)
             throws Exception {
         if (tapPacketReader != null) {