Commit dc6e10fd authored Jan 15, 2024 by Adithya R Committed by Jan Altensen Feb 27, 2024

usb: Show charging notification only if power brick is disconnected

On USB HIDL devices (qcom) and barely-implemented AIDL (older Pixels)
the power brick connection status is always POWER_BRICK_STATUS_UNKNOWN,
leading to charging notification showing up even while charging with a
wall charger.

Properly implemented USB AIDL [1] should report
POWER_BRICK_STATUS_DISCONNECTED when charging with anything other than
a wall charger (i.e SDP/PD), hence use this as the check instead.

[1]: https://android.googlesource.com/device/google/gs101/+/94bc87a6f21a027fc8c30ba3fbf1328b0adc5959/usb/usb/Usb.cpp#785

Fixes a13e3779.

Change-Id: I9e251211e5801b2c1766a12bab7d4787c445dc14

parent 13ee5c44

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1421,7 +1421,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		titleRes = com.android.internal.R.string.usb_charging_notification_title;
		id = SystemMessage.NOTE_USB_CHARGING;
		} else if (mSinkPower && mConnectedToDataDisabledPort
		&& mPowerBrickConnectionStatus != UsbPortStatus.POWER_BRICK_STATUS_CONNECTED) {
		&& mPowerBrickConnectionStatus ==
		UsbPortStatus.POWER_BRICK_STATUS_DISCONNECTED) {
		// Show charging notification when USB Data is disabled on the port, and not
		// connected to a wall charger.
		titleRes = com.android.internal.R.string.usb_charging_notification_title;