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

Commit e177e7bd authored by Puma Hsu's avatar Puma Hsu
Browse files

Fix function setting failed in Developer options 



One can select USB function in Settings->System->
Developer options->Default USB configuration without
a cable connected, and the selected function will be
the default function after re-connecting. However, this
function might be restored to NONE due to ENUMERATION_TIMEOUT
if one selected the function without a cable connected.

When the device is not connected to a host, we should not
queue the ENUMERATION_TIMEOUT while switching function.
Fix it by checking connected status and also make it switch
to corresponding function if an user has selected one in the
Default USB configuration.

Bug: 150422683
Test: Switch functions from Default USB configuration for the
both cases cable connecting and disconnecting. And also try it
while there is the secure lock.
Signed-off-by: default avatarPuma Hsu <pumahsu@google.com>
Change-Id: I1933c098e47496b8d6813a5a4e295bcf12027401
parent 45019d2f

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

+10 −5
Original line number Original line Diff line number Diff line
@@ -445,7 +445,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
    abstract static class UsbHandler extends Handler {

    abstract static class UsbHandler extends Handler {





        // current USB state

        // current USB state

        private boolean mConnected;

        private boolean mHostConnected;

        private boolean mHostConnected;

        private boolean mSourcePower;

        private boolean mSourcePower;

        private boolean mSinkPower;

        private boolean mSinkPower;
@@ -473,6 +472,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
        private final UsbPermissionManager mPermissionManager;

        private final UsbPermissionManager mPermissionManager;

        private NotificationManager mNotificationManager;

        private NotificationManager mNotificationManager;





        protected boolean mConnected;

        protected long mScreenUnlockedFunctions;

        protected long mScreenUnlockedFunctions;

        protected boolean mBootCompleted;

        protected boolean mBootCompleted;

        protected boolean mCurrentFunctionsApplied;

        protected boolean mCurrentFunctionsApplied;
@@ -1794,7 +1794,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                case MSG_SET_FUNCTIONS_TIMEOUT:

                case MSG_SET_FUNCTIONS_TIMEOUT:

                    Slog.e(TAG, "Set functions timed out! no reply from usb hal");

                    Slog.e(TAG, "Set functions timed out! no reply from usb hal");

                    if (msg.arg1 != 1) {

                    if (msg.arg1 != 1) {

                        setEnabledFunctions(UsbManager.FUNCTION_NONE, false);

                        // Set this since default function may be selected from Developer options

                        setEnabledFunctions(mScreenUnlockedFunctions, false);

                    }

                    }

                    break;

                    break;

                case MSG_GET_CURRENT_USB_FUNCTIONS:

                case MSG_GET_CURRENT_USB_FUNCTIONS:
@@ -1816,7 +1817,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                     * Dont force to default when the configuration is already set to default.

                     * Dont force to default when the configuration is already set to default.

                     */

                     */

                    if (msg.arg1 != 1) {

                    if (msg.arg1 != 1) {

                        setEnabledFunctions(UsbManager.FUNCTION_NONE, !isAdbEnabled());

                        // Set this since default function may be selected from Developer options

                        setEnabledFunctions(mScreenUnlockedFunctions, false);

                    }

                    }

                    break;

                    break;

                case MSG_GADGET_HAL_REGISTERED:

                case MSG_GADGET_HAL_REGISTERED:
@@ -1936,8 +1938,11 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                            SET_FUNCTIONS_TIMEOUT_MS - SET_FUNCTIONS_LEEWAY_MS);

                            SET_FUNCTIONS_TIMEOUT_MS - SET_FUNCTIONS_LEEWAY_MS);

                    sendMessageDelayed(MSG_SET_FUNCTIONS_TIMEOUT, chargingFunctions,

                    sendMessageDelayed(MSG_SET_FUNCTIONS_TIMEOUT, chargingFunctions,

                            SET_FUNCTIONS_TIMEOUT_MS);

                            SET_FUNCTIONS_TIMEOUT_MS);

                    if (mConnected) {

                        // Only queue timeout of enumeration when the USB is connected

                        sendMessageDelayed(MSG_FUNCTION_SWITCH_TIMEOUT, chargingFunctions,

                        sendMessageDelayed(MSG_FUNCTION_SWITCH_TIMEOUT, chargingFunctions,

                                SET_FUNCTIONS_TIMEOUT_MS + ENUMERATION_TIME_OUT_MS);

                                SET_FUNCTIONS_TIMEOUT_MS + ENUMERATION_TIME_OUT_MS);

                    }

                    if (DEBUG) Slog.d(TAG, "timeout message queued");

                    if (DEBUG) Slog.d(TAG, "timeout message queued");

                } catch (RemoteException e) {

                } catch (RemoteException e) {

                    Slog.e(TAG, "Remoteexception while calling setCurrentUsbFunctions", e);

                    Slog.e(TAG, "Remoteexception while calling setCurrentUsbFunctions", e);