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

1/n: Clean up BiometricEnrollActivity

Browse Source 
Test: fingerprint and face enroll via
      adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: credential enroll via
      adb shell am start -a android.settings.BIOMETRIC_ENROLL --ei android.provider.extra.BIOMETRIC_AUTHENTICATORS_ALLOWED 32768

Bug: 162341940
Bug: 152242790
Change-Id: Idfdf96891ba9a2394f61eedb0adde2adf9fd85e6
This commit is contained in:
Kevin Chyn
2020-09-09 14:37:53 -07:00
parent bf4aa65842
commit eb8c0f14ea
1 changed files with 85 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/com/android/settings/biometrics/BiometricEnrollActivity.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.biometrics; package com.android.settings.biometrics;
import android.annotation.NonNull;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Intent; import android.content.Intent;
@@ -48,6 +49,8 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
private static final String TAG = "BiometricEnrollActivity"; private static final String TAG = "BiometricEnrollActivity";
// Intent extra. If true, biometric enrollment should skip introductory screens. Currently
// this only applies to fingerprint.
public static final String EXTRA_SKIP_INTRO = "skip_intro"; public static final String EXTRA_SKIP_INTRO = "skip_intro";
public static final class InternalActivity extends BiometricEnrollActivity {} public static final class InternalActivity extends BiometricEnrollActivity {}
@@ -62,64 +65,103 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
Log.d(TAG, "Authenticators: " + authenticators); Log.d(TAG, "Authenticators: " + authenticators);
final BiometricManager bm = getSystemService(BiometricManager.class);
final PackageManager pm = getApplicationContext().getPackageManager(); final PackageManager pm = getApplicationContext().getPackageManager();
Intent intent = null; final boolean hasFeatureFingerprint =
pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
final boolean hasFeatureFace = pm.hasSystemFeature(PackageManager.FEATURE_FACE);
final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
final int result = bm.canAuthenticate(authenticators); if (isSetupWizard) {
if (hasFeatureFace && hasFeatureFingerprint) {
if (!WizardManagerHelper.isAnySetupWizard(getIntent())) { // TODO(b/162341940, b/152242790) this should show a multi-biometric selection
if (result == BiometricManager.BIOMETRIC_SUCCESS // screen
|| result == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) { launchFingerprintOnlyEnroll();
} else if (hasFeatureFace) {
launchFaceOnlyEnroll();
} else if (hasFeatureFingerprint) {
launchFingerprintOnlyEnroll();
} else {
Log.e(TAG, "No biometrics but started by SUW?");
finish();
}
} else {
// If the caller is not setup wizard, and the user has something enrolled, finish.
final BiometricManager bm = getSystemService(BiometricManager.class);
final @BiometricManager.BiometricError int result = bm.canAuthenticate(authenticators);
if (result != BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
Log.e(TAG, "Unexpected result: " + result); Log.e(TAG, "Unexpected result: " + result);
finish(); finish();
return; return;
} }
}
if (authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) { // This will need to be updated if the device has sensors other than BIOMETRIC_STRONG
// If only device credential was specified, ask the user to only set that up. if (authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) {
intent = new Intent(this, ChooseLockGeneric.class); launchCredentialOnlyEnroll();
intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY, } else if (hasFeatureFace && hasFeatureFingerprint) {
DevicePolicyManager.PASSWORD_QUALITY_SOMETHING); // TODO(b/162341940, b/152242790) this should show a multi-biometric selection
} else if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) { // screen
// This logic may have to be modified on devices with multiple biometrics. launchFingerprintOnlyEnroll();
// ChooseLockGeneric can request to start fingerprint enroll bypassing the intro screen. } else if (hasFeatureFingerprint) {
if (getIntent().getBooleanExtra(EXTRA_SKIP_INTRO, false) launchFingerprintOnlyEnroll();
&& this instanceof InternalActivity) { } else if (hasFeatureFace) {
intent = getFingerprintFindSensorIntent(); launchFaceOnlyEnroll();
} else { } else {
intent = getFingerprintIntroIntent(); Log.e(TAG, "Unknown state, finishing");
finish();
}
}
}
/**
* @param intent Enrollment activity that should be started (e.g. FaceEnrollIntroduction.class,
* etc).
*/
private void launchEnrollActivity(@NonNull Intent intent) {
intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
if (this instanceof InternalActivity) {
// Propagate challenge and user Id from ChooseLockGeneric.
final byte[] token = getIntent()
.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
final int userId = getIntent()
.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.USER_NULL);
final long gkPwHandle = getIntent().getLongExtra(
ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 0L);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
intent.putExtra(Intent.EXTRA_USER_ID, userId);
if (gkPwHandle != 0L) {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle);
} }
} else if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {
intent = getFaceIntroIntent();
} }
if (intent != null) { startActivity(intent);
intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); finish();
}
if (this instanceof InternalActivity) { private void launchCredentialOnlyEnroll() {
// Propagate challenge and user Id from ChooseLockGeneric. final Intent intent;
final byte[] token = getIntent() // If only device credential was specified, ask the user to only set that up.
.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); intent = new Intent(this, ChooseLockGeneric.class);
final int userId = getIntent() intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.USER_NULL); DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
final long gkPwHandle = getIntent().getLongExtra( launchEnrollActivity(intent);
ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 0L); }
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token); private void launchFingerprintOnlyEnroll() {
intent.putExtra(Intent.EXTRA_USER_ID, userId); final Intent intent;
if (gkPwHandle != 0L) { // ChooseLockGeneric can request to start fingerprint enroll bypassing the intro screen.
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle); if (getIntent().getBooleanExtra(EXTRA_SKIP_INTRO, false)
} && this instanceof InternalActivity) {
} intent = getFingerprintFindSensorIntent();
startActivity(intent);
finish();
} else { } else {
Log.e(TAG, "Intent was null, finishing"); intent = getFingerprintIntroIntent();
finish();
} }
launchEnrollActivity(intent);
}
private void launchFaceOnlyEnroll() {
final Intent intent = getFaceIntroIntent();
launchEnrollActivity(intent);
} }
private Intent getFingerprintFindSensorIntent() { private Intent getFingerprintFindSensorIntent() {