commit 84e2fc0e79c63b29e1bb17c7f084875c007a5820
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 29 03:40:24 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 29 03:40:24 2023 +0000
tree 48d271ed407099dcc3f04f7e06907f7c9be4ccb0
parent 5b9c3292d4c93973304f792cb2fe32b260eb7ad2
parent e8a85a2765e18aeda0074da7be6a9d49685fd2c2

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23667755'] into udc-release.

Change-Id: I1ba0b3f6fb4038dc836e0bc0abb7b199f76fce36

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 be090e3..fb3319c 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -623,9 +623,9 @@
                 return; // Activity went away
             }
 
-            final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
+            mAddFingerprintPreference = findPreference(KEY_FINGERPRINT_ADD);
 
-            if (addPreference == null) {
+            if (mAddFingerprintPreference == null) {
                 return; // b/275519315 Skip if updateAddPreference() invoke before addPreference()
             }