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

Commit 41ebde2b authored by Jerry Zhang's avatar Jerry Zhang
Browse files

Only send HOST_STATE intents when host mode is used. 

Previously HOST_STATE update intents would broadcast if the
device was in gadget mode but not configured. This would
override the sticky intent, causing MtpReceiver to fail.

This is fixed by only updating host state if host is connected
or if host is being disconnected (was connected before).

Bug: 34873000
Test: set up lockscreen, reboot device while plugged in, unplug before
unlocking, verify usb works.

Change-Id: Ic424e678ba72401ee8ec975e915727272edf3767
parent 5838563e

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

+4 −1
Original line number Diff line number Diff line
@@ -857,13 +857,16 @@ public class UsbDeviceManager { 
                    break;

                case MSG_UPDATE_HOST_STATE:

                    SomeArgs args = (SomeArgs) msg.obj;

                    boolean prevHostConnected = mHostConnected;

                    mHostConnected = (args.argi1 == 1);

                    mSourcePower = (args.argi2 == 1);

                    mSinkPower = (args.argi3 == 1);

                    args.recycle();

                    updateUsbNotification();

                    if (mBootCompleted) {

                        if (mHostConnected || prevHostConnected) {

                            updateUsbStateBroadcastIfNeeded(false);

                        }

                    } else {

                        mPendingBootBroadcast = true;

                    }