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

Commit b0db4017 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "restore the title string un UsbDeviceManager" into oc-dev

parents 794eeebd a71b5918

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

+2 −1
Original line number Diff line number Diff line
@@ -1029,12 +1029,13 @@ public class UsbDeviceManager { 
        private void updateAdbNotification() {

            if (mNotificationManager == null) return;

            final int id = SystemMessage.NOTE_ADB_ACTIVE;

            final int titleRes = com.android.internal.R.string.adb_active_notification_title;

            if (mAdbEnabled && mConnected) {

                if ("0".equals(SystemProperties.get("persist.adb.notify"))) return;



                if (!mAdbNotificationShown) {

                    Resources r = mContext.getResources();

                    CharSequence title = r.getText(id);

                    CharSequence title = r.getText(titleRes);

                    CharSequence message = r.getText(

                            com.android.internal.R.string.adb_active_notification_message);