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

Commit 3d082bdc authored by Chris Wren's avatar Chris Wren Committed by android-build-merger
Browse files

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

am: e04a4491

Change-Id: I29ac04a46804ba2de2acfaa065872f0e03f6f9c3
parents a9a2a0d3 e04a4491

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

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

        private void updateAdbNotification() {

            if (mNotificationManager == null) return;

            if (mNotificationManager == null) return;

            final int id = SystemMessage.NOTE_ADB_ACTIVE;

            final int id = SystemMessage.NOTE_ADB_ACTIVE;

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

            if (mAdbEnabled && mConnected) {

            if (mAdbEnabled && mConnected) {

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

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





                if (!mAdbNotificationShown) {

                if (!mAdbNotificationShown) {

                    Resources r = mContext.getResources();

                    Resources r = mContext.getResources();

                    CharSequence title = r.getText(id);

                    CharSequence title = r.getText(titleRes);

                    CharSequence message = r.getText(

                    CharSequence message = r.getText(

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

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