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

Commit 6276bb89 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Badhri Jagan Sridharan
Browse files

Clear mCurrentAccessory if accessory function is no longer enabled 

Accessory mode implements debounce timeout ACCESSORY_REQUEST_TIMEOUT
within which when a disconnect is seen, the accessory function would
be removed from the usb configuration but mCurrentAccessory would
not be set to NULL until the timeout expires.

Also, setEnabledFunctions(null, false, false) does not force an
additional disconnect when accessory function has already been
removed from usb configuration.

BUG: 62241238
Change-Id: I25973475fb02d613e11396bcad5e88656ad8940a
parent f922271d

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

+3 −1
Original line number Diff line number Diff line
@@ -1032,7 +1032,9 @@ public class UsbDeviceManager { 
                    if (DEBUG) {

                        Slog.v(TAG, "Accessory mode enter timeout: " + mConnected);

                    }

                    if (!mConnected) {

                    if (!mConnected || !UsbManager.containsFunction(

                            mCurrentFunctions,

                            UsbManager.USB_FUNCTION_ACCESSORY)) {

                        notifyAccessoryModeExit();

                    }

                    break;