PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0

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

Change-Id: I5b3920550c231799afcc28c7aeb3150712bd57a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-10 17:57:53 +00:00
committed by Automerger Merge Worker
parent e161c61575 a38c972ef0
commit 2f6bb387f0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/EthernetTetherPreferenceController.java
View File

@@ -26,6 +26,7 @@ import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.Utils;
import com.android.settingslib.utils.ThreadUtils; import com.android.settingslib.utils.ThreadUtils;
import java.util.HashSet; import java.util.HashSet;
@@ -87,7 +88,7 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen
@Override @Override
public boolean shouldShow() { public boolean shouldShow() {
return mEthernetManager != null; return mEthernetManager != null && !Utils.isMonkeyRunning();
} }
@Override @Override