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

Merge "Tests for SUW in work mode" into tm-qpr-dev

Browse Source
This commit is contained in:
Diya Bera
2023-02-01 23:29:35 +00:00
committed by Android (Google) Code Review
parent b5215abde7 1021b58ae5
commit 31406c042d
2 changed files with 199 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,11 @@ import android.hardware.fingerprint.FingerprintManager;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.password.ChooseLockSettingsHelper;
import java.util.function.Function;
/**
* Helper for {@link BiometricEnrollActivity} when multiple sensors exist on a device.
*/
@@ -45,14 +48,39 @@ public class MultiBiometricEnrollHelper {
private final int mUserId;
private final boolean mRequestEnrollFace;
private final boolean mRequestEnrollFingerprint;
private final FingerprintManager mFingerprintManager;
private final FaceManager mFaceManager;
private final Intent mFingerprintEnrollIntroductionIntent;
private final Intent mFaceEnrollIntroductionIntent;
private Function<Long, byte[]> mGatekeeperHatSupplier;
@VisibleForTesting
MultiBiometricEnrollHelper(@NonNull FragmentActivity activity, int userId,
boolean enrollFace, boolean enrollFingerprint, long gkPwHandle) {
boolean enrollFace, boolean enrollFingerprint, long gkPwHandle,
FingerprintManager fingerprintManager,
FaceManager faceManager, Intent fingerprintEnrollIntroductionIntent,
Intent faceEnrollIntroductionIntent, Function<Long, byte[]> gatekeeperHatSupplier) {
mActivity = activity;
mUserId = userId;
mGkPwHandle = gkPwHandle;
mRequestEnrollFace = enrollFace;
mRequestEnrollFingerprint = enrollFingerprint;
mFingerprintManager = fingerprintManager;
mFaceManager = faceManager;
mFingerprintEnrollIntroductionIntent = fingerprintEnrollIntroductionIntent;
mFaceEnrollIntroductionIntent = faceEnrollIntroductionIntent;
mGatekeeperHatSupplier = gatekeeperHatSupplier;
}
MultiBiometricEnrollHelper(@NonNull FragmentActivity activity, int userId,
boolean enrollFace, boolean enrollFingerprint, long gkPwHandle) {
this(activity, userId, enrollFace, enrollFingerprint, gkPwHandle,
activity.getSystemService(FingerprintManager.class),
activity.getSystemService(FaceManager.class),
BiometricUtils.getFingerprintIntroIntent(activity, activity.getIntent()),
BiometricUtils.getFaceIntroIntent(activity, activity.getIntent()),
(challenge) -> BiometricUtils.requestGatekeeperHat(activity, gkPwHandle,
userId, challenge));
}
void startNextStep() {
@@ -67,45 +95,39 @@ public class MultiBiometricEnrollHelper {
}
private void launchFaceEnroll() {
final FaceManager faceManager = mActivity.getSystemService(FaceManager.class);
faceManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {
final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,
mGkPwHandle, mUserId, challenge);
final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity,
mActivity.getIntent());
faceIntent.putExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);
faceIntent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);
BiometricUtils.launchEnrollForResult(mActivity, faceIntent, REQUEST_FACE_ENROLL,
hardwareAuthToken, mGkPwHandle, mUserId);
mFaceManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {
final byte[] hardwareAuthToken = mGatekeeperHatSupplier.apply(challenge);
mFaceEnrollIntroductionIntent.putExtra(
BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);
mFaceEnrollIntroductionIntent.putExtra(
BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);
BiometricUtils.launchEnrollForResult(mActivity, mFaceEnrollIntroductionIntent,
REQUEST_FACE_ENROLL, hardwareAuthToken, mGkPwHandle, mUserId);
});
}
private void launchFingerprintEnroll() {
final FingerprintManager fingerprintManager = mActivity
.getSystemService(FingerprintManager.class);
fingerprintManager.generateChallenge(mUserId, ((sensorId, userId, challenge) -> {
final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,
mGkPwHandle, mUserId, challenge);
final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity,
mActivity.getIntent());
intent.putExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);
intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);
mFingerprintManager.generateChallenge(mUserId, ((sensorId, userId, challenge) -> {
final byte[] hardwareAuthToken = mGatekeeperHatSupplier.apply(challenge);
mFingerprintEnrollIntroductionIntent.putExtra(
BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);
mFingerprintEnrollIntroductionIntent.putExtra(
BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);
if (mRequestEnrollFace) {
// Give FingerprintEnroll a pendingIntent pointing to face enrollment, so that it
// can be started when user skips or finishes fingerprint enrollment.
// FLAG_UPDATE_CURRENT ensures it is launched with the most recent values.
final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity,
mActivity.getIntent());
faceIntent.putExtra(Intent.EXTRA_USER_ID, mUserId);
faceIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
mGkPwHandle);
mFaceEnrollIntroductionIntent.putExtra(Intent.EXTRA_USER_ID, mUserId);
mFaceEnrollIntroductionIntent.putExtra(
ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, mGkPwHandle);
final PendingIntent faceAfterFp = PendingIntent.getActivity(mActivity,
0 /* requestCode */, faceIntent,
0 /* requestCode */, mFaceEnrollIntroductionIntent,
PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
intent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT, faceAfterFp);
mFingerprintEnrollIntroductionIntent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT,
faceAfterFp);
}
BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
hardwareAuthToken, mGkPwHandle, mUserId);
BiometricUtils.launchEnrollForResult(mActivity, mFingerprintEnrollIntroductionIntent,
REQUEST_FINGERPRINT_ENROLL, hardwareAuthToken, mGkPwHandle, mUserId);
}));
}
}