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

Commit 6eef64fe authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan
Browse files

Do not debounce disconnect while resetUsbGadget 

When resetUsbGadget is requested, do not debounce disconnect to allow
falling back to the the default configuration. Also remove
accessory mode enter timeout messages to prevent leaving AOAP
enabled when resetUsbGadget is requested.

Backport of ag/20953426.

Bug: 260145166
Change-Id: I538f405312049846839297dc3835ec2ff7d75084
Merged-in: I538f405312049846839297dc3835ec2ff7d75084
parent 74daba5a

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

+33 −5
Original line number Diff line number Diff line
@@ -510,7 +510,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
        private boolean mUsbAccessoryConnected;

        private boolean mSourcePower;

        private boolean mSinkPower;

        private boolean mConfigured;

        private boolean mAudioAccessoryConnected;

        private boolean mAudioAccessorySupported;
@@ -543,7 +542,12 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
        private final UsbPermissionManager mPermissionManager;

        private NotificationManager mNotificationManager;



        /**

         * Do not debounce for the first disconnect after resetUsbGadget.

         */

        protected boolean mResetUsbGadgetDisableDebounce;

        protected boolean mConnected;

        protected boolean mConfigured;

        protected long mScreenUnlockedFunctions;

        protected boolean mBootCompleted;

        protected boolean mCurrentFunctionsApplied;
@@ -650,16 +654,30 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                Slog.e(TAG, "unknown state " + state);

                return;

            }

            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;

            msg.arg2 = configured;

            // debounce disconnects to avoid problems bringing up USB tethering

            if (DEBUG) {

                Slog.i(TAG, "mResetUsbGadgetDisableDebounce:" + mResetUsbGadgetDisableDebounce

                       + " connected:" + connected + "configured:" + configured);

            }

            if (mResetUsbGadgetDisableDebounce) {

                // Do not debounce disconnect after resetUsbGadget.

                sendMessage(msg);

                if (connected == 1) mResetUsbGadgetDisableDebounce = false;

            } else {

                if (configured == 0) {

                    removeMessages(MSG_UPDATE_STATE);

                    if (DEBUG) Slog.i(TAG, "removeMessages MSG_UPDATE_STATE");

                }

                if (connected == 1) removeMessages(MSG_FUNCTION_SWITCH_TIMEOUT);

                // debounce disconnects to avoid problems bringing up USB tethering.

                sendMessageDelayed(msg,

                    (connected == 0) ? (mScreenLocked ? DEVICE_STATE_UPDATE_DELAY

                                                      : DEVICE_STATE_UPDATE_DELAY_EXT) : 0);

            }

        }



        public void updateHostState(UsbPort port, UsbPortStatus status) {

            if (DEBUG) {
@@ -904,7 +922,10 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                case MSG_UPDATE_STATE:

                    mConnected = (msg.arg1 == 1);

                    mConfigured = (msg.arg2 == 1);



                    if (DEBUG) {

                        Slog.i(TAG, "handleMessage MSG_UPDATE_STATE " + "mConnected:" + mConnected

                               + " mConfigured:" + mConfigured);

                    }

                    updateUsbNotification(false);

                    updateAdbNotification(false);

                    if (mBootCompleted) {
@@ -2010,12 +2031,19 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                        }



                        try {

                            // MSG_ACCESSORY_MODE_ENTER_TIMEOUT has to be removed to allow exiting

                            // AOAP mode during resetUsbGadget.

                            removeMessages(MSG_ACCESSORY_MODE_ENTER_TIMEOUT);

                            if (mConfigured) {

                                mResetUsbGadgetDisableDebounce = true;

                            }

                            android.hardware.usb.gadget.V1_1.IUsbGadget gadgetProxy =

                                    android.hardware.usb.gadget.V1_1.IUsbGadget

                                            .castFrom(mGadgetProxy);

                            gadgetProxy.reset();

                        } catch (RemoteException e) {

                            Slog.e(TAG, "reset Usb Gadget failed", e);

                            mResetUsbGadgetDisableDebounce = false;

                        }

                    }

                    break;