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

Commit 0fd4aadd authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Merge "Let confirmation dialog can appear" am: c98338de am: edcbeec0 am: bab92cb5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326491

Change-Id: Id1858af680aca35b00ea0eac4ec4f42edc03a665
parents 8c8faf7d bab92cb5

services/core/java/com/android/server/adb/AdbService.java

+1 −6
Original line number Diff line number Diff line
@@ -241,12 +241,7 @@ public class AdbService extends IAdbManager.Stub { 
    private AdbService(Context context) {

        mContext = context;

        mContentResolver = context.getContentResolver();



        boolean secureAdbEnabled = AdbProperties.secure().orElse(false);

        boolean dataEncrypted = "1".equals(SystemProperties.get("vold.decrypt"));

        if (secureAdbEnabled && !dataEncrypted) {

        mDebuggingManager = new AdbDebuggingManager(context);

        }



        initAdbState();

        LocalServices.addService(AdbManagerInternal.class, new AdbManagerInternalImpl());