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

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

Browse Source 
* commit '176cfecb083b2cf197649c0c6cf3291d1cd36cf6':
  Preserve notification stats on update
This commit is contained in:
Christoph Studer
2014-05-09 16:40:17 +00:00
committed by Android Git Automerger
parent b33122ff42 2509be2bb7
commit ff4e4860da
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -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 |=

4
services/core/java/com/android/server/notification/NotificationUsageStats.java
View File

@@ -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++;
}