| commit | a38c972ef0cff8ce027a074ef7661378e5434068 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 10 17:04:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 10 17:04:09 2023 +0000 |
| tree | 38d088c6a6c6c0a753013980dbf554d3e4bc4e55 | |
| parent | 7e2d77a71754dbe341e26ecf94735207c65ab08a [diff] | |
| parent | 3c62dd35435bb4d46261921065a1467fba49e478 [diff] |
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443 Change-Id: If51239c47ffc2ebf9c80ce5b8f2e27d8b187a871 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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