Merge "Fixed FaceEnrollIntro crash." into main

2024-05-22 03:21:04 +00:00
parent 39977d496d dd8ff53e1b
commit ea47aabe22
1 changed files with 18 additions and 15 deletions
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -170,6 +170,8 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
            infoMessageRequireEyes.setText(getInfoMessageRequireEyes());
        }

+
+        if (mFaceManager != null) {
            mFaceManager.addAuthenticatorsRegisteredCallback(
                    new IFaceAuthenticatorsRegisteredCallback.Stub() {
                        @Override
@@ -186,6 +188,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
                            onFaceStrengthChanged();
                        }
                    });
+        }

        // This path is an entry point for SetNewPasswordController, e.g.
        // adb shell am start -a android.app.action.SET_NEW_PASSWORD