Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cecd40b8 authored by Priyank Singh's avatar Priyank Singh Committed by android-build-merger
Browse files

Merge ""Charging this device via USB" notification isn't relevant for automotive." into qt-dev 

am: 2dd14519

Change-Id: I95286eacad650fc76fa52f75100ce407a63914ac
parents e97768bd 2dd14519

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

+8 −0
Original line number Diff line number Diff line
@@ -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;