PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update generateChallenge/revokeChallenge w/ frameworks/base

Browse Source 
Bug: 171002801
Bug: 170517180
Test: Enroll on existing devices
Change-Id: I78530fde275c5ac924e50d77de43b90969d6eb5b
This commit is contained in:
Kevin Chyn
2020-10-15 18:26:14 -07:00
parent af667e87c3
commit af7837f602
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
View File

@@ -92,7 +92,7 @@ public class MultiBiometricEnrollHelper {
private void launchFingerprintEnroll() { private void launchFingerprintEnroll() {
final FingerprintManager fingerprintManager = mActivity final FingerprintManager fingerprintManager = mActivity
.getSystemService(FingerprintManager.class); .getSystemService(FingerprintManager.class);
fingerprintManager.generateChallenge(((sensorId, challenge) -> { fingerprintManager.generateChallenge(mUserId, ((sensorId, challenge) -> {
final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity, final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,
mGkPwHandle, mUserId, challenge); mGkPwHandle, mUserId, challenge);
final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity, final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity,

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -65,7 +65,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
// adb shell am start -a android.app.action.SET_NEW_PASSWORD // adb shell am start -a android.app.action.SET_NEW_PASSWORD
if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) { if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
final FingerprintManager fpm = getSystemService(FingerprintManager.class); final FingerprintManager fpm = getSystemService(FingerprintManager.class);
fpm.generateChallenge((sensorId, challenge) -> { fpm.generateChallenge(mUserId, (sensorId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge); mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent()); BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
View File

@@ -140,7 +140,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
private void postEnroll() { private void postEnroll() {
final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this); final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);
if (fpm != null) { if (fpm != null) {
fpm.revokeChallenge(); fpm.revokeChallenge(mUserId);
} }
} }

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -148,7 +148,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
callback.onChallengeGenerated(0, 0L); callback.onChallengeGenerated(0, 0L);
return; return;
} }
mFingerprintManager.generateChallenge(callback::onChallengeGenerated); mFingerprintManager.generateChallenge(mUserId, callback::onChallengeGenerated);
} }
@Override @Override

4
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -571,7 +571,7 @@ public class FingerprintSettings extends SubSettings {
mLaunchedConfirm = false; mLaunchedConfirm = false;
if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) { if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
if (data != null && BiometricUtils.containsGatekeeperPasswordHandle(data)) { if (data != null && BiometricUtils.containsGatekeeperPasswordHandle(data)) {
mFingerprintManager.generateChallenge((sensorId, challenge) -> { mFingerprintManager.generateChallenge(mUserId, (sensorId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data, mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data,
mUserId, challenge); mUserId, challenge);
BiometricUtils.removeGatekeeperPasswordHandle(getActivity(), data); BiometricUtils.removeGatekeeperPasswordHandle(getActivity(), data);
@@ -599,7 +599,7 @@ public class FingerprintSettings extends SubSettings {
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
if (getActivity().isFinishing()) { if (getActivity().isFinishing()) {
mFingerprintManager.revokeChallenge(); mFingerprintManager.revokeChallenge(mUserId);
} }
} }