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

Commit f833f622 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge \\"Prevent NPE in dispatchUserSwitch\\" into nyc-mr1-dev am: 34010567

am: e37af56a

Change-Id: I4e9d921a55459d0c4638bc0993db2a665e1d310a
parents f18572fd e37af56a
Loading
Loading
Loading
Loading
+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 {