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

Merge "Launch FaceEnrollPage form BiometricEnrollActivity"

Browse Source
This commit is contained in:
Vincent Wang
2023-01-09 04:56:44 +00:00
committed by Android (Google) Code Review
parent 3072c2a571 7fdc046d9b
commit b8926bd868
1 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT
import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT_GRANTED; import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_CONSENT_GRANTED;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.Activity;
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;
@@ -73,7 +74,8 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
private static final int REQUEST_CHOOSE_OPTIONS = 3; private static final int REQUEST_CHOOSE_OPTIONS = 3;
// prompt hand phone back to parent after enrollment // prompt hand phone back to parent after enrollment
private static final int REQUEST_HANDOFF_PARENT = 4; private static final int REQUEST_HANDOFF_PARENT = 4;
private static final int REQUEST_SINGLE_ENROLL = 5; private static final int REQUEST_SINGLE_ENROLL_FINGERPRINT = 5;
private static final int REQUEST_SINGLE_ENROLL_FACE = 6;
public static final int RESULT_SKIP = BiometricEnrollBase.RESULT_SKIP; public static final int RESULT_SKIP = BiometricEnrollBase.RESULT_SKIP;
@@ -118,7 +120,6 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
private Bundle mParentalOptions; private Bundle mParentalOptions;
@Nullable private Long mGkPwHandle; @Nullable private Long mGkPwHandle;
@Nullable private ParentalConsentHelper mParentalConsentHelper; @Nullable private ParentalConsentHelper mParentalConsentHelper;
@Nullable private MultiBiometricEnrollHelper mMultiBiometricEnrollHelper;
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -314,8 +315,6 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
} else if (canUseFace || canUseFingerprint) { } else if (canUseFace || canUseFingerprint) {
if (mGkPwHandle == null) { if (mGkPwHandle == null) {
setOrConfirmCredentialsNow(); setOrConfirmCredentialsNow();
} else if (canUseFace && canUseFingerprint) {
launchFaceAndFingerprintEnroll();
} else if (canUseFingerprint) { } else if (canUseFingerprint) {
launchFingerprintOnlyEnroll(); launchFingerprintOnlyEnroll();
} else { } else {
@@ -444,14 +443,14 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
// handles responses while multi biometric enrollment is pending // handles responses while multi biometric enrollment is pending
private void handleOnActivityResultWhileEnrolling( private void handleOnActivityResultWhileEnrolling(
int requestCode, int resultCode, Intent data) { int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_HANDOFF_PARENT) {
Log.d(TAG, "Enrollment complete, requesting handoff, result: " + resultCode); Log.d(TAG, "handleOnActivityResultWhileEnrolling, request = " + requestCode + ""
+ ", resultCode = " + resultCode);
switch (requestCode) {
case REQUEST_HANDOFF_PARENT:
setResult(RESULT_OK, newResultIntent()); setResult(RESULT_OK, newResultIntent());
finish(); finish();
} else if (mMultiBiometricEnrollHelper == null) { break;
overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
switch (requestCode) {
case REQUEST_CHOOSE_LOCK: case REQUEST_CHOOSE_LOCK:
case REQUEST_CONFIRM_LOCK: case REQUEST_CONFIRM_LOCK:
mConfirmingCredentials = false; mConfirmingCredentials = false;
@@ -459,9 +458,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
isSuccessfulConfirmOrChooseCredential(requestCode, resultCode); isSuccessfulConfirmOrChooseCredential(requestCode, resultCode);
if (isOk && (mHasFeatureFace || mHasFeatureFingerprint)) { if (isOk && (mHasFeatureFace || mHasFeatureFingerprint)) {
updateGatekeeperPasswordHandle(data); updateGatekeeperPasswordHandle(data);
if (mHasFeatureFace && mHasFeatureFingerprint) { if (mHasFeatureFingerprint) {
launchFaceAndFingerprintEnroll();
} else if (mHasFeatureFingerprint) {
launchFingerprintOnlyEnroll(); launchFingerprintOnlyEnroll();
} else { } else {
launchFaceOnlyEnroll(); launchFaceOnlyEnroll();
@@ -472,19 +469,35 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
finish(); finish();
} }
break; break;
case REQUEST_SINGLE_ENROLL: case REQUEST_SINGLE_ENROLL_FINGERPRINT:
mIsSingleEnrolling = false; mIsSingleEnrolling = false;
if ((resultCode == BiometricEnrollBase.RESULT_SKIP
|| resultCode == BiometricEnrollBase.RESULT_FINISHED) && mHasFeatureFace) {
launchFaceOnlyEnroll();
} else {
finishOrLaunchHandToParent(resultCode); finishOrLaunchHandToParent(resultCode);
}
break;
case REQUEST_SINGLE_ENROLL_FACE:
mIsSingleEnrolling = false;
if (resultCode == Activity.RESULT_CANCELED && mHasFeatureFingerprint) {
launchFingerprintOnlyEnroll();
} else {
finishOrLaunchHandToParent(resultCode);
}
break; break;
default: default:
Log.w(TAG, "Unknown enrolling requestCode: " + requestCode + ", finishing"); Log.w(TAG, "Unknown enrolling requestCode: " + requestCode + ", finishing");
finish(); finish();
} }
} else {
Log.d(TAG, "RequestCode: " + requestCode + " resultCode: " + resultCode);
BiometricUtils.removeGatekeeperPasswordHandle(this, mGkPwHandle);
finishOrLaunchHandToParent(resultCode);
} }
@Override
public void finish() {
if (mGkPwHandle != null) {
BiometricUtils.removeGatekeeperPasswordHandle(this, mGkPwHandle);
}
super.finish();
} }
private void finishOrLaunchHandToParent(int resultCode) { private void finishOrLaunchHandToParent(int resultCode) {
@@ -630,7 +643,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
} else { } else {
intent = BiometricUtils.getFingerprintIntroIntent(this, getIntent()); intent = BiometricUtils.getFingerprintIntroIntent(this, getIntent());
} }
launchSingleSensorEnrollActivity(intent, REQUEST_SINGLE_ENROLL); launchSingleSensorEnrollActivity(intent, REQUEST_SINGLE_ENROLL_FINGERPRINT);
} }
} }
@@ -638,16 +651,10 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
if (!mIsSingleEnrolling) { if (!mIsSingleEnrolling) {
mIsSingleEnrolling = true; mIsSingleEnrolling = true;
final Intent intent = BiometricUtils.getFaceIntroIntent(this, getIntent()); final Intent intent = BiometricUtils.getFaceIntroIntent(this, getIntent());
launchSingleSensorEnrollActivity(intent, REQUEST_SINGLE_ENROLL); launchSingleSensorEnrollActivity(intent, REQUEST_SINGLE_ENROLL_FACE);
} }
} }
private void launchFaceAndFingerprintEnroll() {
mMultiBiometricEnrollHelper = new MultiBiometricEnrollHelper(this, mUserId,
mIsFaceEnrollable, mIsFingerprintEnrollable, mGkPwHandle);
mMultiBiometricEnrollHelper.startNextStep();
}
private void launchHandoffToParent() { private void launchHandoffToParent() {
final Intent intent = BiometricUtils.getHandoffToParentIntent(this, getIntent()); final Intent intent = BiometricUtils.getHandoffToParentIntent(this, getIntent());
startActivityForResult(intent, REQUEST_HANDOFF_PARENT); startActivityForResult(intent, REQUEST_HANDOFF_PARENT);