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

am: a41d30b5a6 Change-Id: Ia288b222dd26273e7e768b58989eaa29b8652c5a
2019-01-14 19:53:07 -08:00
parent 0198585bc0 a41d30b5a6
commit 3802c87d44
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);