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

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

Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" am: a0360e38 

am: cb6beee2

Change-Id: I534817c867b9dbd045a491dddcbf8190e299d972
parents 46a72044 cb6beee2

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

+5 −2
Original line number Diff line number Diff line
@@ -570,8 +570,11 @@ public class UsbDeviceManager { 
                // Set the new USB configuration.

                setUsbConfig(functions);



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

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

                    // Start up dependent services.

                    updateUsbStateBroadcastIfNeeded(true);

                }



                if (!waitForState(functions)) {

                    Slog.e(TAG, "Failed to switch USB config to " + functions);