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

Commit ff4e4860 authored by Christoph Studer's avatar Christoph Studer Committed by Android Git Automerger
Browse files

am 176cfecb: Merge "Preserve notification stats on update" 

* commit '176cfecb083b2cf197649c0c6cf3291d1cd36cf6':
  Preserve notification stats on update
parents b33122ff 2509be2b

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

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ public class NotificationManagerService extends SystemService { 
    public static final class NotificationRecord

    {

        final StatusBarNotification sbn;

        final SingleNotificationStats stats = new SingleNotificationStats();

        SingleNotificationStats stats;

        IBinder statusBarKey;



        NotificationRecord(StatusBarNotification sbn)
@@ -1639,7 +1639,7 @@ public class NotificationManagerService extends SystemService { 
                    } else {

                        old = mNotificationList.get(index);

                        mNotificationList.set(index, r);

                        mUsageStats.registerUpdatedByApp(r);

                        mUsageStats.registerUpdatedByApp(r, old);

                        // Make sure we don't lose the foreground service state.

                        if (old != null) {

                            notification.flags |=

services/core/java/com/android/server/notification/NotificationUsageStats.java

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ public class NotificationUsageStats { 
     * Called when a notification has been posted.

     */

    public synchronized void registerPostedByApp(NotificationRecord notification) {

        notification.stats = new SingleNotificationStats();

        notification.stats.posttimeElapsedMs = SystemClock.elapsedRealtime();

        for (AggregatedStats stats : getAggregatedStatsLocked(notification)) {

            stats.numPostedByApp++;
@@ -68,7 +69,8 @@ public class NotificationUsageStats { 
    /**

     * Called when a notification has been updated.

     */

    public void registerUpdatedByApp(NotificationRecord notification) {

    public void registerUpdatedByApp(NotificationRecord notification, NotificationRecord old) {

        notification.stats = old.stats;

        for (AggregatedStats stats : getAggregatedStatsLocked(notification)) {

            stats.numUpdatedByApp++;

        }