Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34010567 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

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

parents 44d909c9 599d43b4

services/core/java/com/android/server/am/UserController.java

+3 −1
Original line number Diff line number Diff line
@@ -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 {