diff options
| author | jeffreyhuang <jeffreyhuang@google.com> | 2017-11-06 16:51:27 -0800 |
|---|---|---|
| committer | jeffreyhuang <jeffreyhuang@google.com> | 2017-11-07 09:58:42 -0800 |
| commit | 7b17780134ad883b87fe4d586b072583b2e24441 (patch) | |
| tree | 1977deedcaadf04513aad177f889fb0cb892538b /src/com/android/settings/development/ClearAdbKeysPreferenceController.java | |
| parent | d723394569edd381a8d80b0f6372f7f571cffdbf (diff) | |
| download | packages_apps_Settings-7b17780134ad883b87fe4d586b072583b2e24441.tar.gz packages_apps_Settings-7b17780134ad883b87fe4d586b072583b2e24441.tar.bz2 packages_apps_Settings-7b17780134ad883b87fe4d586b072583b2e24441.zip | |
Prevent monkey from changing usb settings
- Prevent monkey from revoking usb debugging authorizations
- Prevent monkey from changing usb configurations
Bug: 68707778
Test: make RunSettingsRoboTests -j40
Change-Id: Idce99d60f0fbce5a9d93aceb0c2a07d27482de10
Diffstat (limited to 'src/com/android/settings/development/ClearAdbKeysPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/ClearAdbKeysPreferenceController.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index 2248b89683..b512757fc2 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -28,6 +28,7 @@ import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; +import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; @@ -75,6 +76,10 @@ public class ClearAdbKeysPreferenceController extends @Override public boolean handlePreferenceTreeClick(Preference preference) { + if (Utils.isMonkeyRunning()) { + return false; + } + if (TextUtils.equals(preference.getKey(), getPreferenceKey())) { ClearAdbKeysWarningDialog.show(mFragment); return true; |