Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Schematize ADB system properties

Browse Source 
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
This commit is contained in:
Kiyoung Kim
2018-12-27 14:29:54 +09:00
parent db5c59214f
commit 1470f025f5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -69,6 +69,7 @@ import android.os.storage.StorageVolume;
import android.provider.Settings; import android.provider.Settings;
import android.service.usb.UsbDeviceManagerProto; import android.service.usb.UsbDeviceManagerProto;
import android.service.usb.UsbHandlerProto; import android.service.usb.UsbHandlerProto;
import android.sysprop.AdbProperties;
import android.sysprop.VoldProperties; import android.sysprop.VoldProperties;
import android.util.Pair; import android.util.Pair;
import android.util.Slog; import android.util.Slog;
@@ -285,7 +286,7 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver
} }
mControlFds.put(UsbManager.FUNCTION_PTP, ptpFd); mControlFds.put(UsbManager.FUNCTION_PTP, ptpFd);
boolean secureAdbEnabled = SystemProperties.getBoolean("ro.adb.secure", false); boolean secureAdbEnabled = AdbProperties.secure().orElse(false);
boolean dataEncrypted = "1".equals(VoldProperties.decrypt().orElse("")); boolean dataEncrypted = "1".equals(VoldProperties.decrypt().orElse(""));
if (secureAdbEnabled && !dataEncrypted) { if (secureAdbEnabled && !dataEncrypted) {
mDebuggingManager = new UsbDebuggingManager(context); mDebuggingManager = new UsbDebuggingManager(context);