Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f450a7266b

Change-Id: Ie3d52e44e04737d07efe8f75e04cae1e5f86b400
This commit is contained in:
Makoto Onuki
2018-05-08 08:17:18 -07:00
committed by android-build-merger
parent ccb89f9263 f450a7266b
commit 9a20164149
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
View File

@@ -198,7 +198,13 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
showWarningNotification(); showWarningNotification();
mShowing = SHOWING_WARNING; mShowing = SHOWING_WARNING;
} else if (mShowAutoSaverSuggestion) { } else if (mShowAutoSaverSuggestion) {
showAutoSaverSuggestionNotification(); // 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; mShowing = SHOWING_AUTO_SAVER_SUGGESTION;
} else { } else {
mNoMan.cancelAsUser(TAG_BATTERY, SystemMessage.NOTE_BAD_CHARGER, UserHandle.ALL); 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) { private PendingIntent pendingBroadcast(String action) {
return PendingIntent.getBroadcastAsUser(mContext, 0, 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) { private static Intent settings(String action) {