diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-07 17:11:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-07 17:11:26 +0000 |
commit | 6b8b9efad1b8977df5acf7ac3fa589fd9216fded (patch) | |
tree | ee7740b7d2ad4d8053b4dd75edcc567c1e5880a9 | |
parent | ef1cd8a1cad35f576d9bcf3b1c699a7ab89d711d (diff) | |
parent | ce66fa5757e72d1ba1a2326122b35850c16cff5f (diff) | |
download | base-6b8b9efad1b8977df5acf7ac3fa589fd9216fded.tar.gz |
Merge "Avoid removing USB state changes during CONFIGURED uevent"
-rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 21f789f4e735..347dd95363c5 100644 --- 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; |