From 41efb403c85715856571aaa9ebea85b49ca0019a Mon Sep 17 00:00:00 2001 From: Priyank Singh Date: Mon, 15 Apr 2019 08:39:36 -0700 Subject: "Charging this device via USB" notification isn't relevant for automotive. Bug: 124302589 Test: Manual Change-Id: Icaa56c5f9ead79ce0306a95229f915073d1b6a1f --- services/usb/java/com/android/server/usb/UsbDeviceManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 79e6851039ba..5b7d81697c8c 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -1095,6 +1095,14 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser Slog.d(TAG, "Clear notification"); mUsbNotificationId = 0; } + // Not relevant for automotive. + if (mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_AUTOMOTIVE) + && id == SystemMessage.NOTE_USB_CHARGING) { + mUsbNotificationId = 0; + return; + } + if (id != 0) { CharSequence title = r.getText(titleRes); PendingIntent pi; -- cgit v1.2.3-59-g8ed1b