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

Merge "[BiometricsV2] Fix fingerprintSettings not shown"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-14 04:39:57 +00:00
committed by Android (Google) Code Review
parent 101af2e3c9 78e0f9de8a
commit 7cfb668c56
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -920,7 +920,7 @@ public class FingerprintSettings extends SubSettings {
activity.finish(); activity.finish();
} }
} else if (requestCode == AUTO_ADD_FIRST_FINGERPRINT_REQUEST) { } else if (requestCode == AUTO_ADD_FIRST_FINGERPRINT_REQUEST) {
if (resultCode != RESULT_FINISHED || data == null) { if (resultCode != RESULT_FINISHED) {
Log.d(TAG, "Add first fingerprint, fail or null data, result:" + resultCode); Log.d(TAG, "Add first fingerprint, fail or null data, result:" + resultCode);
if (resultCode == BiometricEnrollBase.RESULT_TIMEOUT) { if (resultCode == BiometricEnrollBase.RESULT_TIMEOUT) {
// If "Fingerprint Unlock" is closed because of timeout, notify result code // If "Fingerprint Unlock" is closed because of timeout, notify result code
@@ -932,14 +932,19 @@ public class FingerprintSettings extends SubSettings {
return; return;
} }
mToken = data.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); if (mToken == null && data != null) {
mToken = data.getByteArrayExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
}
if (mToken == null) { if (mToken == null) {
Log.w(TAG, "Add first fingerprint, null token"); Log.w(TAG, "Add first fingerprint, null token");
finish(); finish();
return; return;
} }
mChallenge = data.getLongExtra(EXTRA_KEY_CHALLENGE, -1L); if (mChallenge == -1L && data != null) {
mChallenge = data.getLongExtra(EXTRA_KEY_CHALLENGE, -1L);
}
if (mChallenge == -1L) { if (mChallenge == -1L) {
Log.w(TAG, "Add first fingerprint, invalid challenge"); Log.w(TAG, "Add first fingerprint, invalid challenge");
finish(); finish();