Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ae24317 authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b367774 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556



Change-Id: Iff7b459f36c70d40d4b2117e02dc7620c7504aac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bdf3cb8d 8b367774

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

+22 −14
Original line number Diff line number Diff line
@@ -283,7 +283,9 @@ public class FingerprintSettings extends SubSettings { 
                    case MSG_REFRESH_FINGERPRINT_TEMPLATES:

                        removeFingerprintPreference(msg.arg1);

                        updateAddPreference();

                        if (isSfps()) {

                            updateFingerprintUnlockCategoryVisibility();

                        }

                        updatePreferences();

                        break;

                    case MSG_FINGER_AUTH_SUCCESS:
@@ -494,11 +496,15 @@ public class FingerprintSettings extends SubSettings { 
        }



        private boolean isSfps() {

            mFingerprintManager = Utils.getFingerprintManagerOrNull(getActivity());

            if (mFingerprintManager != null) {

                mSensorProperties = mFingerprintManager.getSensorPropertiesInternal();

                for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {

                    if (prop.isAnySidefpsType()) {

                        return true;

                    }

                }

            }

            return false;

        }
@@ -838,6 +844,7 @@ public class FingerprintSettings extends SubSettings { 


        private List<AbstractPreferenceController> buildPreferenceControllers(Context context) {

            final List<AbstractPreferenceController> controllers = new ArrayList<>();

            if (isSfps()) {

                mFingerprintUnlockCategoryPreferenceController =

                    new FingerprintUnlockCategoryController(

                        context,
@@ -850,6 +857,7 @@ public class FingerprintSettings extends SubSettings { 
                        );

                controllers.add(mFingerprintUnlockCategoryPreferenceController);

                controllers.add(mRequireScreenOnToAuthPreferenceController);

            }

            return controllers;

        }