commit 48543000e0417213b227b1047a83eb7d8528ff35
author Erik Wolsheimer <ewol@google.com> Mon Nov 30 17:35:20 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 30 17:35:20 2015 +0000
tree 5d52448777a9b5d55e8f5353a3d615324aef09bc
parent 19c7afab6244303e78bbc6b5ab04520bbd4172d7
parent 1d92c4538f8ed43a2e9c1e6d4694ddb3fb058741

fix data race condition BUG: 25819358 am: 2242b4d2bd am: 1dbb0355dc
am: 1d92c4538f

* commit '1d92c4538f8ed43a2e9c1e6d4694ddb3fb058741':
  fix data race condition BUG: 25819358

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

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 4351798..288810c 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1289,10 +1289,11 @@
                     Binder.getCallingUid(), incomingUserId, true, false,
                     "getAppActiveNotifications", pkg);
 
-            final int N = mNotificationList.size();
-            final ArrayList<StatusBarNotification> list = new ArrayList<StatusBarNotification>(N);
+            final ArrayList<StatusBarNotification> list
+                    = new ArrayList<StatusBarNotification>(mNotificationList.size());
 
             synchronized (mNotificationList) {
+                final int N = mNotificationList.size();
                 for (int i = 0; i < N; i++) {
                     final StatusBarNotification sbn = mNotificationList.get(i).sbn;
                     if (sbn.getPackageName().equals(pkg) && sbn.getUserId() == userId) {