From 2365ad895adbd56698d6e47832bc749250dc7375 Mon Sep 17 00:00:00 2001 From: Grace Cheng Date: Mon, 12 Jun 2023 20:34:20 +0000 Subject: [PATCH] Fix NPE in updateAddPreference Update mAddFingerprintPreference to avoid NPE Fixes: 286495189 Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash Change-Id: Id7edde492168b467360c6c99b326721cd883bba8 --- .../settings/biometrics/fingerprint/FingerprintSettings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index be090e33366..fb3319c3ff6 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -623,9 +623,9 @@ public class FingerprintSettings extends SubSettings { 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() }