From dd8ff53e1be3da1eb3f89296b39b691f284424f1 Mon Sep 17 00:00:00 2001
From: Joshua McCloskey <joshmccloskey@google.com>
Date: Tue, 21 May 2024 22:32:37 +0000
Subject: [PATCH] Fixed FaceEnrollIntro crash.

Test: Manual.
Fixes: 339306372
Change-Id: Ib6b98f78b734a531378c1162eb86725995f45799
---
 .../face/FaceEnrollIntroduction.java          | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index d776b9af29a..414c5450297 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -170,22 +170,25 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
             infoMessageRequireEyes.setText(getInfoMessageRequireEyes());
         }
 
-        mFaceManager.addAuthenticatorsRegisteredCallback(
-                new IFaceAuthenticatorsRegisteredCallback.Stub() {
-                    @Override
-                    public void onAllAuthenticatorsRegistered(
-                            @NonNull List<FaceSensorPropertiesInternal> sensors) {
-                        if (sensors.isEmpty()) {
-                            Log.e(TAG, "No sensors");
-                            return;
-                        }
 
-                        boolean isFaceStrong = sensors.get(0).sensorStrength
-                                == SensorProperties.STRENGTH_STRONG;
-                        mIsFaceStrong = isFaceStrong;
-                        onFaceStrengthChanged();
-                    }
-                });
+        if (mFaceManager != null) {
+            mFaceManager.addAuthenticatorsRegisteredCallback(
+                    new IFaceAuthenticatorsRegisteredCallback.Stub() {
+                        @Override
+                        public void onAllAuthenticatorsRegistered(
+                                @NonNull List<FaceSensorPropertiesInternal> sensors) {
+                            if (sensors.isEmpty()) {
+                                Log.e(TAG, "No sensors");
+                                return;
+                            }
+
+                            boolean isFaceStrong = sensors.get(0).sensorStrength
+                                    == SensorProperties.STRENGTH_STRONG;
+                            mIsFaceStrong = isFaceStrong;
+                            onFaceStrengthChanged();
+                        }
+                    });
+        }
 
         // This path is an entry point for SetNewPasswordController, e.g.
         // adb shell am start -a android.app.action.SET_NEW_PASSWORD