summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-build-prod@system.gserviceaccount.com>2022-03-07 17:50:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-03-07 17:50:39 +0000
commita42412b7fc93a0eb852d8bf1a4d001f7df7f43b3 (patch)
tree61e131b5bdd4ee0289a811aa72af95ce187cd880
parentb66751ffa5eef523f735184d827c72dce2b15a41 (diff)
parent1f9425d5e876ac203ea2bd55654ae340631f18b1 (diff)
Merge "Avoid removing USB state changes during CONFIGURED uevent" into s-keystone-qcom-dev
-rwxr-xr-xservices/usb/java/com/android/server/usb/UsbDeviceManager.java2
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 b57ea0789ef8..ba6fe4812793 100755
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -636,7 +636,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;