Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212

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

Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Grace Cheng
2023-06-28 18:36:58 +00:00
committed by Automerger Merge Worker

View File

@@ -623,9 +623,9 @@ public class FingerprintSettings extends SubSettings {
return; // Activity went away 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() return; // b/275519315 Skip if updateAddPreference() invoke before addPreference()
} }