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

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

Merge "Broadcast only if boot complete" into oc-dr1-dev 

am: b60c48a6

Change-Id: I53d2958b56ee6b48457741268e8578dc3316091c
parents e510562e b60c48a6

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

+3 −2
Original line number Diff line number Diff line
@@ -693,8 +693,9 @@ public class UsbDeviceManager { 
                // Set the new USB configuration.

                setUsbConfig(oemFunctions);



                if (UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_MTP)

                        || UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_PTP)) {

                if (mBootCompleted

                        && (UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_MTP)

                        || UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_PTP))) {

                    // Start up dependent services.

                    updateUsbStateBroadcastIfNeeded(true);

                }