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

Commit 676fe135 authored by chihhao.chen's avatar chihhao.chen Committed by Josh Gao
Browse files

Let confirmation dialog can appear 

When eng/userdebug load is with user build adbd, we
need to always new AdbDebuggingManager to let confirmation
dialog can appear.

Bug: 158156979
Test: "adb shell" can trigger confirmation dialog
Change-Id: Ia0830c78c8cc913985f41b93eeecf8bf57ec1b03
parent 3bf4ec13

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

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

    private AdbService(Context context) {

        mContext = context;

        mContext = context;

        mContentResolver = context.getContentResolver();

        mContentResolver = context.getContentResolver();



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

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

        if (secureAdbEnabled && !dataEncrypted) {

        mDebuggingManager = new AdbDebuggingManager(context);

        mDebuggingManager = new AdbDebuggingManager(context);

        }





        initAdbState();

        initAdbState();

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

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