Merge "Make sure mCurrentUsbFunctionsRequested flag be updated currectly"

am: 09a47331c9 Change-Id: If34a695b2a0f92b48aebbf793f562b5d5c9ad319
2019-01-14 19:43:58 -08:00
parent b1462fa15b 09a47331c9
commit a41d30b5a6
1 changed files with 1 additions and 1 deletions
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -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);