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

am: d9599faf6b * commit 'd9599faf6b872fb5e1db72f7239b21d05050bd47': Unlocked access of mServices is bad. Change-Id: Ibbaddadfdb3589765b2eee941b19b8dde6c749fa
2016-05-26 18:52:31 +00:00
parent f031dbe7b4 d9599faf6b
commit 3b46f0e8a1
1 changed files with 4 additions and 2 deletions
--- 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();
        }