Merge "Unlocked access of mServices is bad." into nyc-dev

am: d9599faf6b

* commit 'd9599faf6b872fb5e1db72f7239b21d05050bd47':
  Unlocked access of mServices is bad.

Change-Id: I84a2e07aa57e5e25ac1190b4dbfa4005c6d1e572

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 946e4f7..cf4669d 100644 (file)
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -3813,8 +3813,10 @@ public class NotificationManagerService extends SystemService {
 
         @Override
         public void onUserSwitched(int user) {
-            for (ManagedServiceInfo info : mServices) {
-                unregisterService(info.service, info.userid);
+            synchronized (mNotificationList) {
+                for (ManagedServiceInfo info : mServices) {
+                    unregisterService(info.service, info.userid);
+                }
             }
             registerRanker();
         }