Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c33663b authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

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
parent de49496e

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+4 −2
Original line number Diff line number Diff line
@@ -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);

        }