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

Commit 24785d6d authored Feb 14, 2016 by Akshay Thakker Committed by android-build-merger Feb 14, 2016

Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07...

Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07 am: a3798d7a am: d6de8409 am: b9f68696
am: 0318738c

* commit '0318738c':
  Fix missing observer reply callbacks

parents 16bfac9f 0318738c

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

+6 −0

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

	@Override		@Override

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

+6 −0

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