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

Commit ffe79016 authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev... 

Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79 am: 73b41635

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



Change-Id: I289891a055dc36b7df2158de3ef0a12666c80a31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77cd3e4d 73b41635

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -593,10 +593,16 @@ public class FingerprintSettings extends SubSettings { 
        }

        }





        private void updateAddPreference() {

        private void updateAddPreference() {

            if (getActivity() == null) return; // Activity went away

            if (getActivity() == null) {

                return; // Activity went away

            }





            final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);

            final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);





            if (addPreference == null) {

                return; // b/275519315 Skip if updateAddPreference() invoke before addPreference()

            }



            /* Disable preference if too many fingerprints added */

            /* Disable preference if too many fingerprints added */

            final int max = getContext().getResources().getInteger(

            final int max = getContext().getResources().getInteger(

                    com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);

                    com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);