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

Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05 am: b5195183cc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353

Change-Id: Ie9c54fddcb4344051fc492a23bf7102214f10b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-09 03:29:46 +00:00
committed by Automerger Merge Worker
parent eeba25e2f3 b5195183cc
commit 2200654a7b
2 changed files with 125 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
View File

@@ -21,6 +21,7 @@ import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRIN
import static com.android.settings.password.ChooseLockPattern.RESULT_FINISHED;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.hardware.biometrics.SensorProperties;
@@ -179,6 +180,12 @@ public abstract class BiometricsSettingsBase extends DashboardFragment {
}
mFaceManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {
final Activity activity = getActivity();
if (activity == null || activity.isFinishing()) {
Log.e(getLogTag(), "Stop during generating face unlock challenge"
+ " because activity is null or finishing");
return;
}
try {
final byte[] token = requestGatekeeperHat(context, mGkPwHandle, mUserId,
challenge);
@@ -215,6 +222,12 @@ public abstract class BiometricsSettingsBase extends DashboardFragment {
}
mFingerprintManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {
final Activity activity = getActivity();
if (activity == null || activity.isFinishing()) {
Log.e(getLogTag(), "Stop during generating fingerprint challenge"
+ " because activity is null or finishing");
return;
}
try {
final byte[] token = requestGatekeeperHat(context, mGkPwHandle, mUserId,
challenge);