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

Commit 300b7039 authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

Merge "Reorder USB_STATE updates so config_changed is not replaced." into oc-dev 

am: 27e5ec0b

Change-Id: Id7017f4432c8b3a6471e8d12a0afead4d31639fe
parents eb6ec9a7 27e5ec0b

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

+4 −2
Original line number Diff line number Diff line
@@ -843,18 +843,20 @@ public class UsbDeviceManager { 


                    updateUsbNotification();

                    updateAdbNotification();

                    if (mBootCompleted) {

                        Slog.i(TAG, "update state " + mConnected + " " + mConfigured);

                        updateUsbStateBroadcastIfNeeded(false);

                    }

                    if (UsbManager.containsFunction(mCurrentFunctions,

                            UsbManager.USB_FUNCTION_ACCESSORY)) {

                        updateCurrentAccessory();

                    }

                    if (mBootCompleted) {

                        Slog.i(TAG, "update state " + mConnected + " " + mConfigured);

                        if (!mConnected) {

                            // restore defaults when USB is disconnected

                            Slog.i(TAG, "Disconnect, setting usb functions to null");

                            setEnabledFunctions(null, false, false);

                        }

                        updateUsbStateBroadcastIfNeeded(false);

                        updateUsbFunctions();

                    } else {

                        mPendingBootBroadcast = true;