commit c8a58a249d5e231ba158942f445eecac741f74ea
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 10 15:53:41 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 10 15:53:41 2023 +0000
tree c94551f0cd4dfc0ed3f3ad06a262d40be75bd62f
parent 0da4abe1db410dc4d8f56f0013c7140bd7c37f9d
parent 821e70ea59e10102cdb033bfd4e0eea4603bf5db

Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

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

src/com/android/settings/network/EthernetTetherPreferenceController.java

diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java
index 6024839..2fd92f3 100644
--- a/src/com/android/settings/network/EthernetTetherPreferenceController.java
+++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java
@@ -26,6 +26,7 @@
 import androidx.lifecycle.OnLifecycleEvent;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.Utils;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.HashSet;
@@ -87,7 +88,7 @@
 
     @Override
     public boolean shouldShow() {
-        return mEthernetManager != null;
+        return mEthernetManager != null && !Utils.isMonkeyRunning();
     }
 
     @Override