Merge "fpService#authWithPrompt uses correct user handle." into sc-v2-dev (bc7a81d2) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -332,8 +332,8 @@ public class FingerprintService extends SystemService {
		if (!isKeyguard && !Utils.isSettings(getContext(), opPackageName)
		&& sensorProps != null && sensorProps.isAnyUdfpsType()) {
		try {
		return authenticateWithPrompt(operationId, sensorProps, userId, receiver,
		opPackageName, ignoreEnrollmentState);
		return authenticateWithPrompt(operationId, sensorProps, callingUid,
		callingUserId, receiver, opPackageName, ignoreEnrollmentState);
		} catch (PackageManager.NameNotFoundException e) {
		Slog.e(TAG, "Invalid package", e);
		return -1;
		@@ -347,6 +347,7 @@ public class FingerprintService extends SystemService {
		private long authenticateWithPrompt(
		final long operationId,
		@NonNull final FingerprintSensorPropertiesInternal props,
		final int uId,
		final int userId,
		final IFingerprintServiceReceiver receiver,
		final String opPackageName,
		@@ -354,7 +355,7 @@ public class FingerprintService extends SystemService {

		final Context context = getUiContext();
		final Context promptContext = context.createPackageContextAsUser(
		opPackageName, 0 /* flags */, UserHandle.getUserHandleForUid(userId));
		opPackageName, 0 /* flags */, UserHandle.getUserHandleForUid(uId));
		final Executor executor = context.getMainExecutor();

		final BiometricPrompt biometricPrompt = new BiometricPrompt.Builder(promptContext)