2/n: Add default implementation for multi-biometric enroll

1) Adds a layout for multi-biometric selection in BiometricEnrollActivity 2) Adds widgets for checkboxes 3) Shows ConfirmLock*/ChooseLock* for multi-biometric devices in BiometricEnrollActivity 4) finish()'s when loses foreground 5) Adds default string for ChooseLock* and multi-biometrics, e.g. "Set up Password + Biometrics", as well as associated plumbing to bring the user back to BiometricEnrollActivity once the credential is enrolled 6) When max templates enrolled, checkbox becomes disabled and description string is updated Bug: 162341940 Bug: 152242790 Fixes: 161742393 No effect on existing devices with the following: Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL Test: SUW Test: make -j RunSettingsRoboTests Exempt-From-Owner-Approval: Biometric-related change to EncryptionInterstitial Change-Id: I855460d50228ace24d4ec5fbe330f02ab406cc02
2020-09-09 13:28:28 -07:00
parent eb8c0f14ea
commit 87bb772e16
35 changed files with 1281 additions and 270 deletions
--- a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
+++ b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.biometrics;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.hardware.face.FaceManager;
+import android.hardware.fingerprint.FingerprintManager;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.password.ChooseLockSettingsHelper;
+
+/**
+ * Helper for {@link BiometricEnrollActivity} when multiple sensors exist on a device.
+ */
+public class MultiBiometricEnrollHelper {
+
+    private static final String TAG = "MultiBiometricEnrollHelper";
+
+    private static final int REQUEST_FACE_ENROLL = 3000;
+    private static final int REQUEST_FINGERPRINT_ENROLL = 3001;
+
+    public static final String EXTRA_ENROLL_AFTER_FACE = "enroll_after_face";
+
+    @NonNull private final BiometricEnrollActivity mActivity;
+    private final long mGkPwHandle;
+    private final int mUserId;
+    private final boolean mRequestEnrollFace;
+    private final boolean mRequestEnrollFingerprint;
+
+    MultiBiometricEnrollHelper(@NonNull BiometricEnrollActivity activity, int userId,
+            boolean enrollFace, boolean enrollFingerprint, long gkPwHandle) {
+        mActivity = activity;
+        mUserId = userId;
+        mGkPwHandle = gkPwHandle;
+        mRequestEnrollFace = enrollFace;
+        mRequestEnrollFingerprint = enrollFingerprint;
+    }
+
+    void startNextStep() {
+        if (mRequestEnrollFace) {
+            launchFaceEnroll();
+        } else if (mRequestEnrollFingerprint) {
+            launchFingerprintEnroll();
+        } else {
+            mActivity.setResult(BiometricEnrollIntroduction.RESULT_SKIP);
+            mActivity.finish();
+        }
+    }
+
+    private void launchFaceEnroll() {
+        final FaceManager faceManager = mActivity.getSystemService(FaceManager.class);
+        faceManager.generateChallenge((sensorId, challenge) -> {
+            final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,
+                    mGkPwHandle, mUserId, challenge);
+            final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity,
+                    mActivity.getIntent());
+
+            if (mRequestEnrollFingerprint) {
+                // Give FaceEnroll a pendingIntent pointing to fingerprint enrollment, so that it
+                // can be started when user skips or finishes face enrollment.
+                final Intent fpIntent = BiometricUtils.getFingerprintIntroIntent(mActivity,
+                        mActivity.getIntent());
+                fpIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, mGkPwHandle);
+                final PendingIntent fpAfterFaceIntent = PendingIntent.getActivity(mActivity,
+                        0 /* requestCode */, fpIntent, 0 /* flags */);
+                faceIntent.putExtra(EXTRA_ENROLL_AFTER_FACE, fpAfterFaceIntent);
+            }
+
+            BiometricUtils.launchEnrollForResult(mActivity, faceIntent, REQUEST_FACE_ENROLL,
+                    hardwareAuthToken, mGkPwHandle, mUserId);
+        });
+    }
+
+    private void launchFingerprintEnroll() {
+        final FingerprintManager fingerprintManager = mActivity
+                .getSystemService(FingerprintManager.class);
+        fingerprintManager.generateChallenge(((sensorId, challenge) -> {
+            final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,
+                    mGkPwHandle, mUserId, challenge);
+            final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity,
+                    mActivity.getIntent());
+            BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
+                    hardwareAuthToken, mGkPwHandle, mUserId);
+        }));
+    }
+
+    void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Log.d(TAG, "RequestCode: " + requestCode + " resultCode: " + resultCode);
+        if (resultCode != Activity.RESULT_CANCELED) {
+            BiometricUtils.removeGatekeeperPasswordHandle(mActivity, mGkPwHandle);
+            mActivity.setResult(resultCode);
+            mActivity.finish();
+        }
+    }
+}