Merge "Prevent NPE in dispatchUserSwitch" into nyc-mr1-dev

2016-06-24 20:49:09 +00:00
parent 44d909c971 599d43b4fe
commit 340105677e
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -1061,7 +1061,9 @@ final class UserController {
                try {
                    // Prepend with unique prefix to guarantee that keys are unique
                    final String name = "#" + i + " " + mUserSwitchObservers.getBroadcastCookie(i);
-                    mCurWaitingUserSwitchCallbacks.add(name);
+                    synchronized (mService) {
+                        curWaitingUserSwitchCallbacks.add(name);
+                    }
                    final IRemoteCallback callback = new IRemoteCallback.Stub() {
                        @Override
                        public void sendResult(Bundle data) throws RemoteException {