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

Commit 930240e8 authored Nov 20, 2015 by Amith Yamasani Committed by Android (Google) Code Review Nov 20, 2015

Merge "Fix missing observer reply callbacks"

parents 3fac65d9 ca0ac5c6

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -383,6 +383,12 @@ public class PhoneStatusBarPolicy implements Callback {
		@Override
		public void onUserSwitching(int newUserId, IRemoteCallback reply) {
		mUserInfoController.reloadUserInfo();
		if (reply != null) {
		try {
		reply.sendResult(null);
		} catch (RemoteException e) {
		}
		}
		}

		@Override

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -674,7 +674,7 @@ final class UserController {

		void timeoutUserSwitch(UserState uss, int oldUserId, int newUserId) {
		synchronized (mService) {
		Slog.w(TAG, "User switch timeout: from " + oldUserId + " to " + newUserId);
		Slog.wtf(TAG, "User switch timeout: from " + oldUserId + " to " + newUserId);
		sendContinueUserSwitchLocked(uss, oldUserId, newUserId);
		}
		}

services/core/java/com/android/server/fingerprint/FingerprintService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -1139,6 +1139,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
		public void onUserSwitching(int newUserId, IRemoteCallback reply) {
		mHandler.obtainMessage(MSG_USER_SWITCHING, newUserId, 0 /* unused */)
		.sendToTarget();
		if (reply != null) {
		try {
		reply.sendResult(null);
		} catch (RemoteException e) {
		}
		}
		}
		@Override
		public void onUserSwitchComplete(int newUserId) throws RemoteException {