diff options
| author | 2021-01-11 06:01:14 +0000 | |
|---|---|---|
| committer | 2021-01-11 06:01:14 +0000 | |
| commit | 49698f5cb0dd8b95dab009a6eb7a4bff15dac17c (patch) | |
| tree | 54585d9b22022f96db231610bea0211a64ea9af9 | |
| parent | f05cdcd0de4266f5272bd44b731cc57acd9edabc (diff) | |
| parent | 91c1b1c056620ffe2104ba5687017826a2e257d0 (diff) | |
Merge "Increase debounce time for DISCONNECT processing" am: a1be0e120a am: 91c1b1c056
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539944
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie945dd56a4d77a8da4a7b9b0e4c60e76718e4b6b
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 98b9dcd2cc2f..477592ba4129 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -170,7 +170,10 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser // Delay for debouncing USB disconnects. // We often get rapid connect/disconnect events when enabling USB functions, // which need debouncing. - private static final int UPDATE_DELAY = 1000; + private static final int DEVICE_STATE_UPDATE_DELAY = 3000; + + // Delay for debouncing USB disconnects on Type-C ports in host mode + private static final int HOST_STATE_UPDATE_DELAY = 1000; // Timeout for entering USB request mode. // Request is cancelled if host does not configure device within 10 seconds. @@ -583,7 +586,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser msg.arg1 = connected; msg.arg2 = configured; // debounce disconnects to avoid problems bringing up USB tethering - sendMessageDelayed(msg, (connected == 0) ? UPDATE_DELAY : 0); + sendMessageDelayed(msg, (connected == 0) ? DEVICE_STATE_UPDATE_DELAY : 0); } public void updateHostState(UsbPort port, UsbPortStatus status) { @@ -598,7 +601,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser removeMessages(MSG_UPDATE_PORT_STATE); Message msg = obtainMessage(MSG_UPDATE_PORT_STATE, args); // debounce rapid transitions of connect/disconnect on type-c ports - sendMessageDelayed(msg, UPDATE_DELAY); + sendMessageDelayed(msg, HOST_STATE_UPDATE_DELAY); } private void setAdbEnabled(boolean enable) { |