Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8a58a24 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I76493ccb15ff2d58045061ef4c62b20f772aab30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0da4abe1 821e70ea

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

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.lifecycle.Lifecycle; 
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 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen 


    @Override

    public boolean shouldShow() {

        return mEthernetManager != null;

        return mEthernetManager != null && !Utils.isMonkeyRunning();

    }



    @Override