diff options
| author | 2021-01-11 06:15:39 +0000 | |
|---|---|---|
| committer | 2021-01-11 06:15:39 +0000 | |
| commit | 76b6d14f2957bd007105995e836ca92ecb1d78a5 (patch) | |
| tree | 7929b962c7b66ca63c7302aba6ee2cfd41ab0fcc | |
| parent | d35a590157dbbbd9afa859ae9fe49e903d59078c (diff) | |
| parent | 49698f5cb0dd8b95dab009a6eb7a4bff15dac17c (diff) | |
Merge "Increase debounce time for DISCONNECT processing" am: a1be0e120a am: 91c1b1c056 am: 49698f5cb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539944
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1beb97b73c67bb4e4b004c47f3ec8ce61296a460
| -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 d585b2374783..afa35fe8deba 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -175,7 +175,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. @@ -636,7 +639,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) { @@ -651,7 +654,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) { |