diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2019-01-13 08:05:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-13 08:05:42 +0000 |
| commit | 95ca4bf581784b243a7b31cf135d0ff554d6c18a (patch) | |
| tree | 4f7c56bf14061c8462257a3db84687df7eff345e /src | |
| parent | cb789fffd5aecf916d9190869b33ab3453f40486 (diff) | |
| parent | 37bd3482ca2603720f6fad63a8f58c999e88f8aa (diff) | |
| download | packages_apps_Settings-95ca4bf581784b243a7b31cf135d0ff554d6c18a.tar.gz packages_apps_Settings-95ca4bf581784b243a7b31cf135d0ff554d6c18a.tar.bz2 packages_apps_Settings-95ca4bf581784b243a7b31cf135d0ff554d6c18a.zip | |
Merge "Schematize ADB system properties"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/development/ClearAdbKeysPreferenceController.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index e1fda67132..6613cfda18 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -22,6 +22,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserManager; +import android.sysprop.AdbProperties; import android.text.TextUtils; import android.util.Log; @@ -39,9 +40,6 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference private static final String TAG = "ClearAdbPrefCtrl"; private static final String CLEAR_ADB_KEYS = "clear_adb_keys"; - @VisibleForTesting - static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure"; - private final IAdbManager mAdbManager; private final DevelopmentSettingsDashboardFragment mFragment; @@ -55,7 +53,7 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference @Override public boolean isAvailable() { - return SystemProperties.getBoolean(RO_ADB_SECURE_PROPERTY_KEY, false /* default */); + return AdbProperties.secure().orElse(false); } @Override |