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

Commit 9a201641 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Fix "battery saver" notification keeping coming back." into pi-dev 

am: f450a726

Change-Id: Ie3d52e44e04737d07efe8f75e04cae1e5f86b400
parents ccb89f92 f450a726

packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java

+10 −2
Original line number Diff line number Diff line
@@ -198,7 +198,13 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
            showWarningNotification();

            mShowing = SHOWING_WARNING;

        } else if (mShowAutoSaverSuggestion) {

            // Once we showed the notification, don't show it again until it goes SHOWING_NOTHING.

            // This shouldn't be needed, because we have a delete intent on this notification

            // so when it's dismissed we should notice it and clear mShowAutoSaverSuggestion,

            // However we double check here just in case the dismiss intent broadcast is delayed.

            if (mShowing != SHOWING_AUTO_SAVER_SUGGESTION) {

                showAutoSaverSuggestionNotification();

            }

            mShowing = SHOWING_AUTO_SAVER_SUGGESTION;

        } else {

            mNoMan.cancelAsUser(TAG_BATTERY, SystemMessage.NOTE_BAD_CHARGER, UserHandle.ALL);
@@ -303,7 +309,9 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 


    private PendingIntent pendingBroadcast(String action) {

        return PendingIntent.getBroadcastAsUser(mContext, 0,

                new Intent(action).setPackage(mContext.getPackageName()), 0, UserHandle.CURRENT);

                new Intent(action).setPackage(mContext.getPackageName())

                    .setFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                0, UserHandle.CURRENT);

    }



    private static Intent settings(String action) {