commit 7b9a26138feda94191d5d49b0af2abbdd7d2e009
author Jimmy Hu <hhhuuu@google.com> Thu Jun 16 06:10:57 2022 +0000
committer Jimmy Hu <hhhuuu@google.com> Fri Aug 12 02:31:25 2022 +0000
tree 0a5c4d1e4d68135db989709a7d6693a5755fcf41
parent 621c7b69460831682749537a1de09c21ec85de56

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: Jimmy Hu <hhhuuu@google.com>
Merged-In: Ie4c67c639d8633361e5a3675502283cae4e35bd9
Change-Id: Ie4c67c639d8633361e5a3675502283cae4e35bd9

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

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 610190e..2fc893e 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -494,6 +494,7 @@
         // current USB state
         private boolean mHostConnected;
         private boolean mUsbAccessoryConnected;
+        private boolean mInHostModeWithNoAccessoryConnected;
         private boolean mSourcePower;
         private boolean mSinkPower;
         private boolean mConfigured;
@@ -947,6 +948,17 @@
                         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();
@@ -971,6 +983,12 @@
                         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();
@@ -1171,7 +1189,8 @@
 
             // 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);