Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jimmy Hu
2022-06-16 06:10:57 +00:00
parent 621c7b6946
commit 7b9a26138f
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -494,6 +494,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;
@@ -947,6 +948,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();
@@ -971,6 +983,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();
@@ -1171,7 +1189,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);