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

Commit dc80d82e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix notifications for USB PD enabled devices" into nyc-mr1-dev... 

Merge "Merge "Fix notifications for USB PD enabled devices" into nyc-mr1-dev am: a57386b4" into nyc-mr1-dev-plus-aosp
parents 2e2a044e 64f2e171

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

+12 −3
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ public class UsbDeviceManager { 
        // current USB state

        private boolean mConnected;

        private boolean mHostConnected;

        private boolean mSourcePower;

        private boolean mConfigured;

        private boolean mUsbDataUnlocked;

        private String mCurrentFunctions;
@@ -399,7 +400,8 @@ public class UsbDeviceManager { 


        public void updateHostState(UsbPort port, UsbPortStatus status) {

            boolean hostConnected = status.getCurrentDataRole() == UsbPort.DATA_ROLE_HOST;

            obtainMessage(MSG_UPDATE_HOST_STATE, hostConnected ? 1 :0, 0).sendToTarget();

            boolean sourcePower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE;

            obtainMessage(MSG_UPDATE_HOST_STATE, hostConnected ? 1 :0, sourcePower ? 1 :0).sendToTarget();

        }



        private boolean waitForState(String state) {
@@ -717,6 +719,7 @@ public class UsbDeviceManager { 
                    break;

                case MSG_UPDATE_HOST_STATE:

                    mHostConnected = (msg.arg1 == 1);

                    mSourcePower = (msg.arg2 == 1);

                    updateUsbNotification();

                    if (mBootCompleted) {

                        updateUsbStateBroadcastIfNeeded();
@@ -782,7 +785,11 @@ public class UsbDeviceManager { 
            Resources r = mContext.getResources();

            if (mConnected) {

                if (!mUsbDataUnlocked) {

                    if (mSourcePower) {

                        id = com.android.internal.R.string.usb_supplying_notification_title;

                    } else {

                        id = com.android.internal.R.string.usb_charging_notification_title;

                    }

                } else if (UsbManager.containsFunction(mCurrentFunctions,

                        UsbManager.USB_FUNCTION_MTP)) {

                    id = com.android.internal.R.string.usb_mtp_notification_title;
@@ -795,10 +802,12 @@ public class UsbDeviceManager { 
                } else if (UsbManager.containsFunction(mCurrentFunctions,

                        UsbManager.USB_FUNCTION_ACCESSORY)) {

                    id = com.android.internal.R.string.usb_accessory_notification_title;

                } else if (mSourcePower) {

                    id = com.android.internal.R.string.usb_supplying_notification_title;

                } else {

                    id = com.android.internal.R.string.usb_charging_notification_title;

                }

            } else if (mHostConnected) {

            } else if (mSourcePower) {

                id = com.android.internal.R.string.usb_supplying_notification_title;

            }

            if (id != mUsbNotificationId) {