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

Commit 2135f414 authored by Jerry Zhang's avatar Jerry Zhang
Browse files

Don't set functions at registration on boot 

If onRegistration is called before functions
are received, adb can be kicked on boot. To fix,
don't set functions if they are still being
requested.

Bug: 73168456
Test: adb logcat doesn't dc
Change-Id: I25bfe13604f0ce0c65c3eb82bcfafd9fcae0283f
parent fc7423bc

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

+1 −1
Original line number Diff line number Diff line
@@ -1786,7 +1786,7 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver 
                        mGadgetProxy = IUsbGadget.getService();

                        mGadgetProxy.linkToDeath(new UsbGadgetDeathRecipient(),

                                USB_GADGET_HAL_DEATH_COOKIE);

                        if (!mCurrentFunctionsApplied) {

                        if (!mCurrentFunctionsApplied && !mCurrentUsbFunctionsRequested) {

                            setEnabledFunctions(mCurrentFunctions, false);

                        }

                    } catch (NoSuchElementException e) {