diff options
| author | 2022-02-16 05:16:59 +0000 | |
|---|---|---|
| committer | 2022-02-16 05:16:59 +0000 | |
| commit | 2ac83c4e475576b529a09b2414487efd152af205 (patch) | |
| tree | 2a1928103b5155266b0228bf8d6348911882537c | |
| parent | 1797a7624273b02a93145decb6864611e7d43bcf (diff) | |
| parent | d68e9ab71560dd400de993e12bf46bc38388d56f (diff) | |
Merge "Fix handling usb notification after pr_swap complete" am: b681fec035 am: d68e9ab715
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984546
Change-Id: If30aa79cfa99800596749c542a909a137541630d
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 3882acfec2bc..5ada2a43ea2f 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -489,6 +489,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser // current USB state private boolean mHostConnected; + private boolean mUsbAccessoryConnected; private boolean mSourcePower; private boolean mSinkPower; private boolean mConfigured; @@ -958,10 +959,10 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser break; case MSG_UPDATE_HOST_STATE: Iterator devices = (Iterator) msg.obj; - boolean connected = (msg.arg1 == 1); + mUsbAccessoryConnected = (msg.arg1 == 1); if (DEBUG) { - Slog.i(TAG, "HOST_STATE connected:" + connected); + Slog.i(TAG, "HOST_STATE connected:" + mUsbAccessoryConnected); } mHideUsbNotification = false; @@ -1215,7 +1216,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser } else if (mSourcePower) { titleRes = com.android.internal.R.string.usb_supplying_notification_title; id = SystemMessage.NOTE_USB_SUPPLYING; - } else if (mHostConnected && mSinkPower && mUsbCharging) { + } else if (mHostConnected && mSinkPower && (mUsbCharging || mUsbAccessoryConnected)) { titleRes = com.android.internal.R.string.usb_charging_notification_title; id = SystemMessage.NOTE_USB_CHARGING; } |