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

Commit 1ffb7d5e authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Adding null check to prevent NPE" into tm-dev am: da9b7dca am: 547b8e2c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938066



Change-Id: I028c3f8e01f5d0f0b91ce294d3970adb91768a9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f559852a 547b8e2c

core/java/android/app/KeyguardManager.java

+4 −2
Original line number Diff line number Diff line
@@ -262,8 +262,10 @@ public class KeyguardManager { 
            CharSequence title, CharSequence description, int userId,

            boolean disallowBiometricsIfPolicyExists) {

        Intent intent = this.createConfirmDeviceCredentialIntent(title, description, userId);

        if (intent != null) {

            intent.putExtra(EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,

                    disallowBiometricsIfPolicyExists);

        }

        return intent;

    }