diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 59bbc1379e8..40a719a35d4 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -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);