Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
am: f0614ef722
am: 2d5f43d7e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674 Change-Id: I49c7ff8a9a2191ac8d001c89a41aa0d09a93bbf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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()
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user