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

Commit 03224011 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Fix hiding ADB notification" into cm-11.0

parents 2d5a2ae8 66d0a8d2

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

+6 −1
Original line number Diff line number Diff line
@@ -745,8 +745,13 @@ public class UsbDeviceManager { 
            if (mAdbEnabled && mConnected) {

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

                 || Settings.Secure.getInt(mContext.getContentResolver(),

                    Settings.Secure.ADB_NOTIFY, 1) == 0)

                    Settings.Secure.ADB_NOTIFY, 1) == 0) {

                    if (mAdbNotificationShown) {

                        mAdbNotificationShown = false;

                        mNotificationManager.cancelAsUser(null, id, UserHandle.ALL);

                    }

                    return;

                }



                if (!mAdbNotificationShown) {

                    Resources r = mContext.getResources();