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

Merge "usb: Don't show the notification when no USB device is connected" am: e648d3cb91 am: 40f45bddd3 am: 3161749b06

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2181961

Change-Id: I8233171ff77cdfc81fa9471ed32377a2163d4e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-08-17 07:25:21 +00:00
committed by Automerger Merge Worker
parent 536e72f5fb 3161749b06
commit 12699672b5
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

@@ -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);