commit 732053f9940a7b530212a34e75c4565cbcb66924
author Chris Wren <cwren@android.com> Tue Jun 21 21:52:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 21 21:52:23 2016 +0000
tree 99ba75fdd007942f673c2a30e45cb515fc462c59
parent 30975ad80b1a1cbb25f905805b23fcdd68ac6980
parent 7595478ff2c8da07311da19d2e402ed90ed7fc8f

Merge \"registerUpdatedByApp should be synchronized\" into nyc-dev
am: 7595478ff2

Change-Id: I78349914370d1a72f616b4ee8cd7188fe0a416c1

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

diff --git a/services/core/java/com/android/server/notification/NotificationUsageStats.java b/services/core/java/com/android/server/notification/NotificationUsageStats.java
index 07142f0..34c5283 100644
--- a/services/core/java/com/android/server/notification/NotificationUsageStats.java
+++ b/services/core/java/com/android/server/notification/NotificationUsageStats.java
@@ -146,7 +146,8 @@
     /**
      * Called when a notification has been updated.
      */
-    public void registerUpdatedByApp(NotificationRecord notification, NotificationRecord old) {
+    public synchronized void registerUpdatedByApp(NotificationRecord notification,
+            NotificationRecord old) {
         notification.stats.updateFrom(old.stats);
         AggregatedStats[] aggregatedStatsArray = getAggregatedStatsLocked(notification);
         for (AggregatedStats stats : aggregatedStatsArray) {