Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76b6d14f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Increase debounce time for DISCONNECT processing" am: a1be0e12 am:... 

Merge "Increase debounce time for DISCONNECT processing" am: a1be0e12 am: 91c1b1c0 am: 49698f5c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539944

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1beb97b73c67bb4e4b004c47f3ec8ce61296a460
parents d35a5901 49698f5c

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+6 −3
Original line number Diff line number Diff line
@@ -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) {