Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93e78039 authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba96001 am: f0614ef7 am: 2d5f43d7 

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



Change-Id: I49c7ff8a9a2191ac8d001c89a41aa0d09a93bbf1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67e3bf99 2d5f43d7

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -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()

            }