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

Add mandatory biometric for exported enroll intents

Browse Source 
Flag: android.hardware.biometrics.flags.mandatory_biometrics
Fixes: 358173662
Test: N/A
Change-Id: Ic67d42ba84220f4c18cf445ae75d4f7f8dfd1f39
This commit is contained in:
Diya Bera
2024-08-27 14:10:17 +00:00
parent e7c670ea27
commit b8ab650afe
4 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.SetupSkipDialog;
@@ -417,6 +418,15 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
getNextButton().setEnabled(true);
}));
}
final Utils.BiometricStatus biometricStatus =
Utils.requestBiometricAuthenticationForMandatoryBiometrics(this,
false /* biometricsAuthenticationRequested */, mUserId);
if (biometricStatus == Utils.BiometricStatus.OK) {
Utils.launchBiometricPromptForMandatoryBiometrics(this,
BIOMETRIC_AUTH_REQUEST, mUserId, true /* hideBackground */);
} else if (biometricStatus != Utils.BiometricStatus.NOT_ACTIVE) {
finish();
}
} else {
setResult(resultCode, data);
finish();
@@ -445,6 +455,10 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
setResult(resultCode, data);
finish();
}
} else if (requestCode == BIOMETRIC_AUTH_REQUEST) {
if (resultCode != RESULT_OK) {
finish();
}
}
super.onActivityResult(requestCode, resultCode, data);
}