Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Increase debounce time for DISCONNECT processing"" into sc-dev am: 3e46e3bd10 am: f587a0416e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439364

Change-Id: Ia5af3a0e7ad31095af77d6b886f707275797ff9f
This commit is contained in:
TreeHugger Robot
2021-12-21 19:07:16 +00:00
committed by Automerger Merge Worker
parent 379347b29a f587a0416e
commit 3b800994af
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -175,10 +175,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
// Delay for debouncing USB disconnects. // Delay for debouncing USB disconnects.
// We often get rapid connect/disconnect events when enabling USB functions, // We often get rapid connect/disconnect events when enabling USB functions,
// which need debouncing. // which need debouncing.
private static final int DEVICE_STATE_UPDATE_DELAY = 3000; private static final int UPDATE_DELAY = 1000;
// 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. // Timeout for entering USB request mode.
// Request is cancelled if host does not configure device within 10 seconds. // Request is cancelled if host does not configure device within 10 seconds.
@@ -639,7 +636,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
msg.arg1 = connected; msg.arg1 = connected;
msg.arg2 = configured; msg.arg2 = configured;
// debounce disconnects to avoid problems bringing up USB tethering // debounce disconnects to avoid problems bringing up USB tethering
sendMessageDelayed(msg, (connected == 0) ? DEVICE_STATE_UPDATE_DELAY : 0); sendMessageDelayed(msg, (connected == 0) ? UPDATE_DELAY : 0);
} }
public void updateHostState(UsbPort port, UsbPortStatus status) { public void updateHostState(UsbPort port, UsbPortStatus status) {
@@ -654,7 +651,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
removeMessages(MSG_UPDATE_PORT_STATE); removeMessages(MSG_UPDATE_PORT_STATE);
Message msg = obtainMessage(MSG_UPDATE_PORT_STATE, args); Message msg = obtainMessage(MSG_UPDATE_PORT_STATE, args);
// debounce rapid transitions of connect/disconnect on type-c ports // debounce rapid transitions of connect/disconnect on type-c ports
sendMessageDelayed(msg, HOST_STATE_UPDATE_DELAY); sendMessageDelayed(msg, UPDATE_DELAY);
} }
private void setAdbEnabled(boolean enable) { private void setAdbEnabled(boolean enable) {