From 5c33663bb526bd518b82cc57bc437a36fcc8522b Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Thu, 27 Dec 2018 14:29:54 +0900 Subject: [PATCH] Schematize ADB system properties Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: m -j Change-Id: I654c0e1f234d097a66f79ba8c019b8bebc794816 Merged-In: I654c0e1f234d097a66f79ba8c019b8bebc794816 --- .../usb/java/com/android/server/usb/UsbDeviceManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index cb96e9dd02438..da682c6df621a 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -69,6 +69,8 @@ import android.os.storage.StorageVolume; import android.provider.Settings; import android.service.usb.UsbDeviceManagerProto; import android.service.usb.UsbHandlerProto; +import android.sysprop.AdbProperties; +import android.sysprop.VoldProperties; import android.util.Pair; import android.util.Slog; @@ -284,8 +286,8 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver } mControlFds.put(UsbManager.FUNCTION_PTP, ptpFd); - boolean secureAdbEnabled = SystemProperties.getBoolean("ro.adb.secure", false); - boolean dataEncrypted = "1".equals(SystemProperties.get("vold.decrypt")); + boolean secureAdbEnabled = AdbProperties.secure().orElse(false); + boolean dataEncrypted = "1".equals(VoldProperties.decrypt().orElse("")); if (secureAdbEnabled && !dataEncrypted) { mDebuggingManager = new UsbDebuggingManager(context); }