Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-02e1f9eca09a4c4c9ff2ae6cc54927d9" into sc-qpr1-dev

Browse Source 
* changes:
  [DO NOT MERGE] fpService#authWithPrompt uses correct user handle. 2p: c79346286e
  [DO NOT MERGE] fpService#authWithPrompt uses correct user handle.
This commit is contained in:
TreeHugger Robot
2022-10-28 17:24:14 +00:00
committed by Android (Google) Code Review
parent 1d806d66fe 96cefbd5ce
commit 7868551705
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,8 +332,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 {
return authenticateWithPrompt(operationId, sensorProps, userId, receiver, return 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);
return -1; return -1;
@@ -347,13 +347,14 @@ public class FingerprintService extends SystemService {
private long authenticateWithPrompt( private long 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)