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

Merge "Schematize ADB system properties" am: 750b90a22b

Browse Source 
am: 974ace22f9

Change-Id: I04ab4b50e76d05341b4033c5e44cc6cb62964c39
This commit is contained in:
Kiyoung Kim
2019-02-12 18:18:16 -08:00
committed by android-build-merger
parent b941bc46b5 974ace22f9
commit de1971d7a0
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/development/ClearAdbKeysPreferenceController.java
View File

@@ -20,8 +20,8 @@ import android.content.Context;
import android.hardware.usb.IUsbManager;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.os.UserManager;
import android.sysprop.AdbProperties;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -38,9 +38,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 IUsbManager mUsbManager;
private final DevelopmentSettingsDashboardFragment mFragment;
@@ -54,7 +51,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