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

Commit a958fc79 authored by Bill Lin's avatar Bill Lin Committed by Android (Google) Code Review
Browse files

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

parents 85d5e3ef 8e12f525

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

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



        private void updateAddPreference() {

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

            if (getActivity() == null) {

                return; // Activity went away

            }



            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 */

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

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