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

Update biometric onChallengeGenerated with frameworks/base

Browse Source 
Bug: 145978626
Test: Builds

Change-Id: If02497fa6462f1ff263aeb96cf0beed014fee328
This commit is contained in:
Kevin Chyn
2020-07-30 23:28:59 -07:00
parent 9af90d3cf4
commit 9ce9d3d539
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -126,7 +126,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
public abstract void onClick(LinkSpan span);
protected interface GenerateChallengeCallback {
void onChallengeGenerated(long challenge);
void onChallengeGenerated(int sensorId, long challenge);
}
@Override
@@ -276,7 +276,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
updatePasswordQuality();
overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
getNextButton().setEnabled(false);
getChallenge((challenge -> {
getChallenge(((sensorId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
getNextButton().setEnabled(true);
}));
@@ -289,7 +289,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
if (resultCode == RESULT_OK && data != null) {
overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
getNextButton().setEnabled(false);
getChallenge((challenge -> {
getChallenge(((sensorId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
getNextButton().setEnabled(true);
}));

4
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -103,7 +103,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
mFooterBarMixin.getPrimaryButton().setEnabled(false);
// We either block on generateChallenge, or need to gray out the "next" button until
// the challenge is ready. Let's just do this for now.
mFaceManager.generateChallenge(challenge -> {
mFaceManager.generateChallenge((sensorId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
mFooterBarMixin.getPrimaryButton().setEnabled(true);
});
@@ -185,7 +185,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
protected void getChallenge(GenerateChallengeCallback callback) {
mFaceManager = Utils.getFaceManagerOrNull(this);
if (mFaceManager == null) {
callback.onChallengeGenerated(0L);
callback.onChallengeGenerated(0, 0L);
return;
}
mFaceManager.generateChallenge(callback::onChallengeGenerated);

2
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -244,7 +244,7 @@ public class FaceSettings extends DashboardFragment {
if (requestCode == CONFIRM_REQUEST) {
if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
// The pin/pattern/password was set.
mFaceManager.generateChallenge(challenge -> {
mFaceManager.generateChallenge((sensorId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(getPrefContext(), data, mUserId,
challenge);
mAttentionController.setToken(mToken);

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
if (mToken == null && BiometricUtils.containsGatekeeperPassword(getIntent())) {
final FingerprintManager fpm = getSystemService(FingerprintManager.class);
fpm.generateChallenge(challenge -> {
fpm.generateChallenge((sensorId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
// Put this into the intent. This is really just to work around the fact that the

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

@@ -134,7 +134,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
protected void getChallenge(GenerateChallengeCallback callback) {
mFingerprintManager = Utils.getFingerprintManagerOrNull(this);
if (mFingerprintManager == null) {
callback.onChallengeGenerated(0L);
callback.onChallengeGenerated(0, 0L);
return;
}
mFingerprintManager.generateChallenge(callback::onChallengeGenerated);

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

@@ -571,7 +571,7 @@ public class FingerprintSettings extends SubSettings {
mLaunchedConfirm = false;
if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
if (data != null && BiometricUtils.containsGatekeeperPassword(data)) {
mFingerprintManager.generateChallenge(challenge -> {
mFingerprintManager.generateChallenge((sensorId, challenge) -> {
mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data,
mUserId, challenge);
updateAddPreference();