From af7837f602254486166ed0af1a240194737f8930 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Thu, 15 Oct 2020 18:26:14 -0700
Subject: [PATCH] Update generateChallenge/revokeChallenge w/ frameworks/base

Bug: 171002801
Bug: 170517180
Test: Enroll on existing devices
Change-Id: I78530fde275c5ac924e50d77de43b90969d6eb5b
---
 .../settings/biometrics/MultiBiometricEnrollHelper.java       | 2 +-
 .../biometrics/fingerprint/FingerprintEnrollFindSensor.java   | 2 +-
 .../biometrics/fingerprint/FingerprintEnrollFinish.java       | 2 +-
 .../biometrics/fingerprint/FingerprintEnrollIntroduction.java | 2 +-
 .../settings/biometrics/fingerprint/FingerprintSettings.java  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
index c1e906a8d44..78a29b352d9 100644
--- a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
+++ b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
@@ -92,7 +92,7 @@ public class MultiBiometricEnrollHelper {
     private void launchFingerprintEnroll() {
         final FingerprintManager fingerprintManager = mActivity
                 .getSystemService(FingerprintManager.class);
-        fingerprintManager.generateChallenge(((sensorId, challenge) -> {
+        fingerprintManager.generateChallenge(mUserId, ((sensorId, challenge) -> {
             final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,
                     mGkPwHandle, mUserId, challenge);
             final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity,
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index c320ef5a8d0..234666f520c 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -65,7 +65,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
         // adb shell am start -a android.app.action.SET_NEW_PASSWORD
         if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
             final FingerprintManager fpm = getSystemService(FingerprintManager.class);
-            fpm.generateChallenge((sensorId, challenge) -> {
+            fpm.generateChallenge(mUserId, (sensorId, challenge) -> {
                 mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
                 BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());
 
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 9a1229063f7..3adbd0d25d5 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -140,7 +140,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
     private void postEnroll() {
         final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);
         if (fpm != null) {
-            fpm.revokeChallenge();
+            fpm.revokeChallenge(mUserId);
         }
     }
 
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index f5dc0e6f695..c2dc3ac2720 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -148,7 +148,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
             callback.onChallengeGenerated(0, 0L);
             return;
         }
-        mFingerprintManager.generateChallenge(callback::onChallengeGenerated);
+        mFingerprintManager.generateChallenge(mUserId, callback::onChallengeGenerated);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 37820391c5a..88920ad4a6e 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -571,7 +571,7 @@ public class FingerprintSettings extends SubSettings {
                 mLaunchedConfirm = false;
                 if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
                     if (data != null && BiometricUtils.containsGatekeeperPasswordHandle(data)) {
-                        mFingerprintManager.generateChallenge((sensorId, challenge) -> {
+                        mFingerprintManager.generateChallenge(mUserId, (sensorId, challenge) -> {
                             mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data,
                                     mUserId, challenge);
                             BiometricUtils.removeGatekeeperPasswordHandle(getActivity(), data);
@@ -599,7 +599,7 @@ public class FingerprintSettings extends SubSettings {
         public void onDestroy() {
             super.onDestroy();
             if (getActivity().isFinishing()) {
-                mFingerprintManager.revokeChallenge();
+                mFingerprintManager.revokeChallenge(mUserId);
             }
         }