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

Commit 55ba81e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "usb: Add the boot completed check before broadcasting intent" into... 

Merge "usb: Add the boot completed check before broadcasting intent" into tm-dev am: acb5ec3d am: 41a80d5e am: 3ad5df4b

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



Change-Id: I4626c5d5bcb6637821e18b9964f4edea1f42d654
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2045301a 3ad5df4b

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

+11 −1
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
        protected boolean mCurrentUsbFunctionsReceived;

        protected int mUsbSpeed;

        protected int mCurrentGadgetHalVersion;

        protected boolean mPendingBootAccessoryHandshakeBroadcast;



        /**

         * The persistent property which stores whether adb is enabled or not.
@@ -1113,7 +1114,13 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                    if (DEBUG) {

                        Slog.v(TAG, "Accessory handshake timeout");

                    }

                    if (mBootCompleted) {

                        broadcastUsbAccessoryHandshake();

                    } else {

                        if (DEBUG) Slog.v(TAG, "Pending broadcasting intent as "

                                + "not boot completed yet.");

                        mPendingBootAccessoryHandshakeBroadcast = true;

                    }

                    break;

                }

                case MSG_INCREASE_SENDSTRING_COUNT: {
@@ -1137,8 +1144,11 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                if (mCurrentAccessory != null) {

                    mUsbDeviceManager.getCurrentSettings().accessoryAttached(mCurrentAccessory);

                    broadcastUsbAccessoryHandshake();

                } else if (mPendingBootAccessoryHandshakeBroadcast) {

                    broadcastUsbAccessoryHandshake();

                }



                mPendingBootAccessoryHandshakeBroadcast = false;

                updateUsbNotification(false);

                updateAdbNotification(false);

                updateUsbFunctions();