Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: I6332c141e3bb13b49bbabfcfebc3e91b8a5faf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Grace Cheng
2023-06-13 20:01:00 +00:00
committed by Automerger Merge Worker

View File

@@ -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()
}