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

Commit 3802c87d authored by Howard Yen's avatar Howard Yen Committed by android-build-merger
Browse files

Merge "Make sure mCurrentUsbFunctionsRequested flag be updated currectly" am: 09a47331 

am: a41d30b5

Change-Id: Ia288b222dd26273e7e768b58989eaa29b8652c5a
parents 0198585b a41d30b5

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

+1 −1
Original line number Diff line number Diff line
@@ -1759,8 +1759,8 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver 
                    mGadgetProxy.linkToDeath(new UsbGadgetDeathRecipient(),

                            USB_GADGET_HAL_DEATH_COOKIE);

                    mCurrentFunctions = UsbManager.FUNCTION_NONE;

                    mGadgetProxy.getCurrentUsbFunctions(new UsbGadgetCallback());

                    mCurrentUsbFunctionsRequested = true;

                    mGadgetProxy.getCurrentUsbFunctions(new UsbGadgetCallback());

                }

                String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();

                updateState(state);