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

Commit eae5eacd authored by Jimmy Hu's avatar Jimmy Hu
Browse files

usb: Don't show the notification when no USB device is connected 



Currently, the "Charging connected device via USB" notification appears
and then disappears when a USB device is disconnected. The notification
should not appear when no USB device is connected. This CL prevents
this.

Also prevents the notification from showing up when a mouse is
connected.

Bug: 234548453
Test: Peripheral mode, host mode, and Power/Data role swap
Signed-off-by: default avatarJimmy Hu <hhhuuu@google.com>
Change-Id: Ie4c67c639d8633361e5a3675502283cae4e35bd9
parent 57e20399

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

+20 −1
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
        // current USB state

        private boolean mHostConnected;

        private boolean mUsbAccessoryConnected;

        private boolean mInHostModeWithNoAccessoryConnected;

        private boolean mSourcePower;

        private boolean mSinkPower;

        private boolean mConfigured;
@@ -959,6 +960,17 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                        mSupportsAllCombinations = false;

                    }



                    if (mHostConnected) {

                        if (!mUsbAccessoryConnected) {

                            mInHostModeWithNoAccessoryConnected = true;

                        } else {

                            mInHostModeWithNoAccessoryConnected = false;

                        }

                    } else {

                        // if not in host mode, reset value to false

                        mInHostModeWithNoAccessoryConnected = false;

                    }



                    mAudioAccessorySupported = port.isModeSupported(MODE_AUDIO_ACCESSORY);



                    args.recycle();
@@ -983,6 +995,12 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                        Slog.i(TAG, "HOST_STATE connected:" + mUsbAccessoryConnected);

                    }



                    if (!devices.hasNext()) {

                        mInHostModeWithNoAccessoryConnected = true;

                    } else {

                        mInHostModeWithNoAccessoryConnected = false;

                    }



                    mHideUsbNotification = false;

                    while (devices.hasNext()) {

                        Map.Entry pair = (Map.Entry) devices.next();
@@ -1192,7 +1210,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 


            // Dont show the notification when connected to a USB peripheral

            // and the link does not support PR_SWAP and DR_SWAP

            if (mHideUsbNotification && !mSupportsAllCombinations) {

            if ((mHideUsbNotification || mInHostModeWithNoAccessoryConnected)

                    && !mSupportsAllCombinations) {

                if (mUsbNotificationId != 0) {

                    mNotificationManager.cancelAsUser(null, mUsbNotificationId,

                            UserHandle.ALL);