Merge "Fixed not able to launch FaceSettings page when face is enrolled" into main

This commit is contained in:
Shawn Lin
2025-03-11 19:09:34 -07:00
committed by Android (Google) Code Review

View File

@@ -70,6 +70,7 @@ public class FaceSettings extends DashboardFragment {
private static final String TAG = "FaceSettings"; private static final String TAG = "FaceSettings";
private static final String KEY_TOKEN = "hw_auth_token"; private static final String KEY_TOKEN = "hw_auth_token";
private static final String KEY_CONFIRMING_PASSWORD = "confirming_password";
private static final String KEY_RE_ENROLL_FACE = "re_enroll_face_unlock"; private static final String KEY_RE_ENROLL_FACE = "re_enroll_face_unlock";
private static final String KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED = private static final String KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED =
"biometrics_successfully_authenticated"; "biometrics_successfully_authenticated";
@@ -163,6 +164,7 @@ public class FaceSettings extends DashboardFragment {
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putByteArray(KEY_TOKEN, mToken); outState.putByteArray(KEY_TOKEN, mToken);
outState.putBoolean(KEY_CONFIRMING_PASSWORD, mConfirmingPassword);
} }
@Override @Override
@@ -273,6 +275,7 @@ public class FaceSettings extends DashboardFragment {
if (savedInstanceState != null) { if (savedInstanceState != null) {
mToken = savedInstanceState.getByteArray(KEY_TOKEN); mToken = savedInstanceState.getByteArray(KEY_TOKEN);
mConfirmingPassword = savedInstanceState.getBoolean(KEY_CONFIRMING_PASSWORD);
} }
if (Flags.biometricsOnboardingEducation()) { if (Flags.biometricsOnboardingEducation()) {