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

Commit 6586cf6d authored by Wesley Wang's avatar Wesley Wang
Browse files

Update low battery notification logging timing 

 - Move LOW_BATTERY_NOTIFICATION to showLowBatteryWarning() instead of
   notification creating to avoid double logging when updating
   notification
 - Add delete intent to log notification dismiss event

Bug: 218405244
Test: atest SystemUITests
Change-Id: I1a2bbbe4166db9cba122914c8024a2389d6cd9cc
parent 248de47f

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

+2 −1
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                        .setContentText(contentText)

                        .setContentTitle(title)

                        .setOnlyAlertOnce(true)

                        .setDeleteIntent(pendingBroadcast(ACTION_DISMISSED_WARNING))

                        .setStyle(new Notification.BigTextStyle().bigText(contentText))

                        .setVisibility(Notification.VISIBILITY_PUBLIC);

        if (hasBatterySettings()) {
@@ -333,7 +334,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        final Notification n = nb.build();

        mNoMan.cancelAsUser(TAG_BATTERY, SystemMessage.NOTE_BAD_CHARGER, UserHandle.ALL);

        mNoMan.notifyAsUser(TAG_BATTERY, SystemMessage.NOTE_POWER_LOW, n, UserHandle.ALL);

        logEvent(BatteryWarningEvents.LowBatteryWarningEvent.LOW_BATTERY_NOTIFICATION);

    }



    private boolean showSevereLowBatteryDialog() {
@@ -615,6 +615,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
        Slog.i(TAG,

                "show low battery warning: level=" + mBatteryLevel

                        + " [" + mBucket + "] playSound=" + playSound);

        logEvent(BatteryWarningEvents.LowBatteryWarningEvent.LOW_BATTERY_NOTIFICATION);

        mPlaySound = playSound;

        mWarning = true;

        updateNotification();