commit 4e77d26b0963ee21cb286083dbe4b2995a26bbaa
author Mark Chien <markchien@google.com> Tue Jul 04 09:32:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 04 09:32:19 2023 +0000
tree 766494e7c658aa262cc6993f4c4ae733110593f5
parent b57e43196fb5d304ff3100e19e7fd21e0df29b52
parent df41b36fc905d455b0c9172621fcc09b472b8ec6

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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2646401

Change-Id: I029786cf9a7d159c90093f2f81f0e917b3361420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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) {