commit 3b46f0e8a194d35e98c29f60679b3a1a915e44dd
author Julia Reynolds <juliacr@google.com> Thu May 26 18:52:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 26 18:52:31 2016 +0000
tree 41d304cd1982b82b54f0dd450fe0734f88cd026d
parent f031dbe7b47f0af931bbc88b07edd40a3bbc7937
parent d9599faf6b872fb5e1db72f7239b21d05050bd47

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

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

Change-Id: Ibbaddadfdb3589765b2eee941b19b8dde6c749fa

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 c61228d..0c35f50 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -3813,8 +3813,10 @@
 
         @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();
         }