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

Commit 9439be77 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Merge changes I9acb1145,Ie1bc4a92 into rvc-dev am: 2ca72c47 am: fea08f57 am: 8933863d 

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

Change-Id: I434def3b706dd05e6d041f694a7e40fd181df02b
parents 665eb319 8933863d

packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java

+6 −1
Original line number Diff line number Diff line
@@ -139,13 +139,18 @@ public class UsbDebuggingActivity extends AlertActivity 
        if (mDisconnectedReceiver != null) {

            mBroadcastDispatcher.unregisterReceiver(mDisconnectedReceiver);

        }

        super.onStop();

    }



    @Override

    protected void onDestroy() {

        // If the ADB service has not yet been notified due to this dialog being closed in some

        // other way then notify the service to deny the connection to ensure system_server sends

        // a response to adbd.

        if (!mServiceNotified) {

            notifyService(false);

        }

        super.onStop();

        super.onDestroy();

    }



    @Override

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

+2 −1
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ public class AdbDebuggingManager { 


                case MESSAGE_ADB_DENY:

                    if (mThread != null) {

                        Slog.w(TAG, "Denying adb confirmation");

                        mThread.sendResponse("NO");

                        logAdbConnectionChanged(null, AdbProtoEnums.USER_DENIED, false);

                    }
@@ -887,7 +888,7 @@ public class AdbDebuggingManager { 
                    String key = (String) msg.obj;

                    if ("trigger_restart_min_framework".equals(

                            SystemProperties.get("vold.decrypt"))) {

                        Slog.d(TAG, "Deferring adb confirmation until after vold decrypt");

                        Slog.w(TAG, "Deferring adb confirmation until after vold decrypt");

                        if (mThread != null) {

                            mThread.sendResponse("NO");

                            logAdbConnectionChanged(key, AdbProtoEnums.DENIED_VOLD_DECRYPT, false);