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

Commit 81bea0f9 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 20005 

* changes:
  Use USB notification instead of battery notification for USB debugging warning.
parents ee2805d9 ea8b7d56

services/java/com/android/server/NotificationManagerService.java

+9 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ class NotificationManagerService extends INotificationManager.Stub 
    private Vibrator mVibrator = new Vibrator();



    // adb

    private int mBatteryPlugged;

    private boolean mUsbConnected;

    private boolean mAdbEnabled = false;

    private boolean mAdbNotificationShown = false;

    private Notification mAdbNotification;
@@ -310,8 +310,11 @@ class NotificationManagerService extends INotificationManager.Stub 
                    mBatteryFull = batteryFull;

                    updateLights();

                }

                

                mBatteryPlugged = intent.getIntExtra("plugged", 0);

            } else if (action.equals(Intent.ACTION_UMS_CONNECTED)) {

                mUsbConnected = true;

                updateAdbNotification();

            } else if (action.equals(Intent.ACTION_UMS_DISCONNECTED)) {

                mUsbConnected = false;

                updateAdbNotification();

            } else if (action.equals(Intent.ACTION_PACKAGE_REMOVED)

                    || action.equals(Intent.ACTION_PACKAGE_RESTARTED)) {
@@ -380,6 +383,8 @@ class NotificationManagerService extends INotificationManager.Stub 
        // register for battery changed notifications

        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_BATTERY_CHANGED);

        filter.addAction(Intent.ACTION_UMS_CONNECTED);

        filter.addAction(Intent.ACTION_UMS_DISCONNECTED);

        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);

        filter.addAction(Intent.ACTION_PACKAGE_RESTARTED);

        mContext.registerReceiver(mIntentReceiver, filter);
@@ -954,7 +959,7 @@ class NotificationManagerService extends INotificationManager.Stub 
    // security feature that we don't want people customizing the platform

    // to accidentally lose.

    private void updateAdbNotification() {

        if (mAdbEnabled && mBatteryPlugged == BatteryManager.BATTERY_PLUGGED_USB) {

        if (mAdbEnabled && mUsbConnected) {

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

                return;

            }