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

Unverified Commit 14bbaa7b authored by Tommy Webb's avatar Tommy Webb Committed by Michael Bestas
Browse files

UsbDeviceManager: Adapt for data signaling quirks 

Always treat USB as disconnected if USB data signaling is turned off.
Set USB functions to none, and send a state change event.

The resulting behavior matches the Google Pixel series, which already
reports USB as disconnected when data signaling is turned off, but the
Motorola series (and maybe others that use Qualcomm's HAL) do not.

Test: Manual: Set Restrict USB to Always allow. Connect to a computer.
Observe the USB notification on device. Set Restrict USB to Deny. Check
that the notification disappears. Search Settings for USB and tap the
Connected devices > USB result. The "Use USB for" section is disabled.

Issue: calyxos#2154
Change-Id: I9d8753d4dbb18012e0d40f4991ab4c15bad14de1
parent 9b41dbbe

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

+10 −2
Original line number Original line Diff line number Diff line
@@ -1247,7 +1247,9 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                    UsbPort port = (UsbPort) args.arg1;

                    UsbPort port = (UsbPort) args.arg1;

                    UsbPortStatus status = (UsbPortStatus) args.arg2;

                    UsbPortStatus status = (UsbPortStatus) args.arg2;





                    if (status != null) {

                    final boolean isDataForcedOff = status != null && status.getUsbDataStatus()

                            == UsbPortStatus.DATA_STATUS_DISABLED_FORCE;

                    if (status != null && !isDataForcedOff) {

                        mHostConnected = status.getCurrentDataRole() == DATA_ROLE_HOST;

                        mHostConnected = status.getCurrentDataRole() == DATA_ROLE_HOST;

                        mSourcePower = status.getCurrentPowerRole() == POWER_ROLE_SOURCE;

                        mSourcePower = status.getCurrentPowerRole() == POWER_ROLE_SOURCE;

                        mSinkPower = status.getCurrentPowerRole() == POWER_ROLE_SINK;

                        mSinkPower = status.getCurrentPowerRole() == POWER_ROLE_SINK;
@@ -1277,6 +1279,12 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                        mPowerBrickConnectionStatus = UsbPortStatus.POWER_BRICK_STATUS_UNKNOWN;

                        mPowerBrickConnectionStatus = UsbPortStatus.POWER_BRICK_STATUS_UNKNOWN;

                    }

                    }





                    if (isDataForcedOff) {

                        mConnected = false;

                        setEnabledFunctions(UsbManager.FUNCTION_NONE, false,

                                /* operationId */ sUsbOperationCount.incrementAndGet());

                    }



                    if (mHostConnected) {

                    if (mHostConnected) {

                        if (!mUsbAccessoryConnected) {

                        if (!mUsbAccessoryConnected) {

                            mInHostModeWithNoAccessoryConnected = true;

                            mInHostModeWithNoAccessoryConnected = true;
@@ -1295,7 +1303,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                    args.recycle();

                    args.recycle();

                    updateUsbNotification(false);

                    updateUsbNotification(false);

                    if (mBootCompleted) {

                    if (mBootCompleted) {

                        if (mHostConnected || prevHostConnected) {

                        if (mHostConnected || prevHostConnected || isDataForcedOff) {

                            updateUsbStateBroadcastIfNeeded(getAppliedFunctions(mCurrentFunctions));

                            updateUsbStateBroadcastIfNeeded(getAppliedFunctions(mCurrentFunctions));

                        }

                        }

                    } else {

                    } else {