Merge "Avoid removing USB state changes during CONFIGURED uevent"

2022-03-07 17:11:26 +00:00
parent ef1cd8a1ca ce66fa5757
commit 6b8b9efad1
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
@@ -634,7 +634,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
                Slog.e(TAG, "unknown state " + state);
                return;
            }
-            removeMessages(MSG_UPDATE_STATE);
+            if (configured == 0) removeMessages(MSG_UPDATE_STATE);
            if (connected == 1) removeMessages(MSG_FUNCTION_SWITCH_TIMEOUT);
            Message msg = Message.obtain(this, MSG_UPDATE_STATE);
            msg.arg1 = connected;