Merge "[DO NOT MERGE] fpService#authWithPrompt uses correct user handle." into sc-dev (f7d906ad) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -298,8 +298,8 @@ public class FingerprintService extends SystemService {
	if (!isKeyguard && !Utils.isSettings(getContext(), opPackageName)		if (!isKeyguard && !Utils.isSettings(getContext(), opPackageName)
	&& sensorProps != null && sensorProps.isAnyUdfpsType()) {		&& sensorProps != null && sensorProps.isAnyUdfpsType()) {
	try {		try {
	authenticateWithPrompt(operationId, sensorProps, userId, receiver,		authenticateWithPrompt(operationId, sensorProps, callingUid,
	opPackageName);		callingUserId, receiver, opPackageName);
	} catch (PackageManager.NameNotFoundException e) {		} catch (PackageManager.NameNotFoundException e) {
	Slog.e(TAG, "Invalid package", e);		Slog.e(TAG, "Invalid package", e);
	}		}
	@@ -313,13 +313,14 @@ public class FingerprintService extends SystemService {
	private void authenticateWithPrompt(		private void authenticateWithPrompt(
	final long operationId,		final long operationId,
	@NonNull final FingerprintSensorPropertiesInternal props,		@NonNull final FingerprintSensorPropertiesInternal props,
			final int uId,
	final int userId,		final int userId,
	final IFingerprintServiceReceiver receiver,		final IFingerprintServiceReceiver receiver,
	final String opPackageName) throws PackageManager.NameNotFoundException {		final String opPackageName) throws PackageManager.NameNotFoundException {

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

	final BiometricPrompt biometricPrompt = new BiometricPrompt.Builder(promptContext)		final BiometricPrompt biometricPrompt = new BiometricPrompt.Builder(promptContext)