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

am: 60453d14ad

* commit '60453d14ad737b7bdb77cf8204dcb1450bc3b0c0':
  Unlocked access of mServices is bad.

Change-Id: Iaa4cdffe47be29eb9e4f2302c78d38fb2a97176e

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