commit a958fc79c8e8d3bc1a74690584875c4dd8e86c91
author Bill Lin <lbill@google.com> Fri Apr 21 07:35:55 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 21 07:35:55 2023 +0000
tree 604bba2d43e16e1e01655d171d3dcf7e48ff116a
parent 85d5e3efb8d15006b64434e2be7e6903748ff034
parent 8e12f5257d0f662431fec2bd5cddeb1c9acef76d

Merge "Add Null check FingerprintSettings#updateAddPreference()" 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 59bbc13..40a719a 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -593,10 +593,16 @@
         }
 
         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);