commit 8b36777419065297cf8c97bcd345f86f27f437da
author Grace Cheng <graciecheng@google.com> Mon May 01 22:40:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 01 22:40:59 2023 +0000
tree 36271619d4c756218d0f1e1682c3d71f952ff3d2
parent 83c04b32d1e9f49ace4e18c2f466186fac2a13af
parent ec1bd37db06c791b20b2e7c229d5b40eada025b9

Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index a5e5f57..e0f402b 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -283,7 +283,9 @@
                     case MSG_REFRESH_FINGERPRINT_TEMPLATES:
                         removeFingerprintPreference(msg.arg1);
                         updateAddPreference();
-                        updateFingerprintUnlockCategoryVisibility();
+                        if (isSfps()) {
+                            updateFingerprintUnlockCategoryVisibility();
+                        }
                         updatePreferences();
                         break;
                     case MSG_FINGER_AUTH_SUCCESS:
@@ -494,9 +496,13 @@
         }
 
         private boolean isSfps() {
-            for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
-                if (prop.isAnySidefpsType()) {
-                    return true;
+            mFingerprintManager = Utils.getFingerprintManagerOrNull(getActivity());
+            if (mFingerprintManager != null) {
+                mSensorProperties = mFingerprintManager.getSensorPropertiesInternal();
+                for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
+                    if (prop.isAnySidefpsType()) {
+                        return true;
+                    }
                 }
             }
             return false;
@@ -838,18 +844,20 @@
 
         private List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
             final List<AbstractPreferenceController> controllers = new ArrayList<>();
-            mFingerprintUnlockCategoryPreferenceController =
+            if (isSfps()) {
+                mFingerprintUnlockCategoryPreferenceController =
                     new FingerprintUnlockCategoryController(
-                            context,
-                            KEY_FINGERPRINT_UNLOCK_CATEGORY
+                        context,
+                        KEY_FINGERPRINT_UNLOCK_CATEGORY
                     );
-            mRequireScreenOnToAuthPreferenceController =
-                    new FingerprintSettingsRequireScreenOnToAuthPreferenceController(
-                            context,
-                            KEY_REQUIRE_SCREEN_ON_TO_AUTH
-                    );
-            controllers.add(mFingerprintUnlockCategoryPreferenceController);
-            controllers.add(mRequireScreenOnToAuthPreferenceController);
+                mRequireScreenOnToAuthPreferenceController =
+                        new FingerprintSettingsRequireScreenOnToAuthPreferenceController(
+                                context,
+                                KEY_REQUIRE_SCREEN_ON_TO_AUTH
+                        );
+                controllers.add(mFingerprintUnlockCategoryPreferenceController);
+                controllers.add(mRequireScreenOnToAuthPreferenceController);
+            }
             return controllers;
         }