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

Commit da9b7dca authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Adding null check to prevent NPE" into tm-dev

parents e2b3d4ec 7fe81a61

core/java/android/app/KeyguardManager.java

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

            CharSequence title, CharSequence description, int userId,

            boolean disallowBiometricsIfPolicyExists) {

            boolean disallowBiometricsIfPolicyExists) {

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

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

        if (intent != null) {

            intent.putExtra(EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,

            intent.putExtra(EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,

                    disallowBiometricsIfPolicyExists);

                    disallowBiometricsIfPolicyExists);

        }

        return intent;

        return intent;

    }

    }