Merge "Fixed race condition with different profiles" into qt-r1-dev (5faf43ad) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/BiometricServiceBase.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -912,8 +912,12 @@ public abstract class BiometricServiceBase extends SystemService
		}

		protected void setActiveUserInternal(int userId) {
		// Do not put on handler, since it should finish before returning to caller.
		mHandler.post(() -> {
		if (DEBUG) {
		Slog.d(getTag(), "setActiveUser(" + userId + ")");
		}
		updateActiveGroup(userId, null /* clientPackage */);
		});
		}

		protected void removeInternal(RemovalClient client) {

services/core/java/com/android/server/biometrics/face/FaceService.java

+20 −12

Original line number	Diff line number	Diff line
		@@ -611,6 +611,7 @@ public class FaceService extends BiometricServiceBase {
		public void resetLockout(byte[] token) {
		checkPermission(MANAGE_BIOMETRIC);

		mHandler.post(() -> {
		if (!FaceService.this.hasEnrolledBiometrics(mCurrentUserId)) {
		Slog.w(TAG, "Ignoring lockout reset, no templates enrolled");
		return;
		@@ -623,15 +624,19 @@ public class FaceService extends BiometricServiceBase {
		} catch (RemoteException e) {
		Slog.e(getTag(), "Unable to reset lockout", e);
		}
		});
		}

		@Override
		public void setFeature(int userId, int feature, boolean enabled, final byte[] token,
		IFaceServiceReceiver receiver, final String opPackageName) {
		checkPermission(MANAGE_BIOMETRIC);
		updateActiveGroup(userId, opPackageName);

		mHandler.post(() -> {
		if (DEBUG) {
		Slog.d(TAG, "setFeature for user(" + userId + ")");
		}
		updateActiveGroup(userId, opPackageName);
		if (!FaceService.this.hasEnrolledBiometrics(mCurrentUserId)) {
		Slog.e(TAG, "No enrolled biometrics while setting feature: " + feature);
		return;
		@@ -662,9 +667,12 @@ public class FaceService extends BiometricServiceBase {
		public void getFeature(int userId, int feature, IFaceServiceReceiver receiver,
		final String opPackageName) {
		checkPermission(MANAGE_BIOMETRIC);
		updateActiveGroup(userId, opPackageName);

		mHandler.post(() -> {
		if (DEBUG) {
		Slog.d(TAG, "getFeature for user(" + userId + ")");
		}
		updateActiveGroup(userId, opPackageName);
		// This should ideally return tri-state, but the user isn't shown settings unless
		// they are enrolled so it's fine for now.
		if (!FaceService.this.hasEnrolledBiometrics(mCurrentUserId)) {