| commit | e8a85a2765e18aeda0074da7be6a9d49685fd2c2 | [log] [tgz] |
|---|---|---|
| author | Grace Cheng <graciecheng@google.com> | Mon Jun 12 20:34:20 2023 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Thu Jun 29 03:39:21 2023 +0000 |
| tree | 48d271ed407099dcc3f04f7e06907f7c9be4ccb0 | |
| parent | 5b9c3292d4c93973304f792cb2fe32b260eb7ad2 [diff] |
Fix NPE in updateAddPreference Update mAddFingerprintPreference to avoid NPE Fixes: 286495189 Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f58714496ab5454ea10c6d638c094bb1d21306d8) Merged-In: Id7edde492168b467360c6c99b326721cd883bba8 Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
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() }