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

Commit a4af5a3d authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "fpService#authWithPrompt uses correct user handle." into tm-dev am:... 

Merge "fpService#authWithPrompt uses correct user handle." into tm-dev am: e891733b am: 5bcb6fe2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18689172



Change-Id: I950d5f7be14af2dc273a44fce98f5937216a0f96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d93a22ea 5bcb6fe2

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

+4 −3
Original line number Diff line number Diff line
@@ -354,8 +354,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;
@@ -369,6 +369,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,
@@ -376,7 +377,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)