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

am: 3b46f0e8a1

* commit '3b46f0e8a194d35e98c29f60679b3a1a915e44dd':
  Unlocked access of mServices is bad.

Change-Id: I78bbd3bb5f54b512740ce72e5168c605d2902fa5

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();
         }