diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-07 17:26:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-07 17:26:54 +0000 |
| commit | da70fd1af30d4d54fb62594ca94719180944ba3c (patch) | |
| tree | d714c4bbb801016a17c16ba82923f7fa1b145a53 | |
| parent | 25128ddbfd9f5e5621af1a822a613a7850b1ae60 (diff) | |
| parent | 6b8b9efad1b8977df5acf7ac3fa589fd9216fded (diff) | |
| download | base-da70fd1af30d4d54fb62594ca94719180944ba3c.tar.gz | |
Merge "Avoid removing USB state changes during CONFIGURED uevent" am: 6b8b9efad1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1898830
Change-Id: Ia1a792ea55cff7136c3dc133c4deb5caf7c96809
| -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 5ada2a43ea2f..af1d56aef310 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -631,7 +631,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; |