From 7fe81a61c5548a2e0530e190b604fe096b71a779 Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Mon, 25 Apr 2022 13:14:12 +0800
Subject: Adding null check to prevent NPE

#createConfirmDeviceCredentialIntent returns null if the device
is insecure.

Bug: 229950204
Test: atest StartActivityAsUserTests
Change-Id: I7de3e72d0677044e282952126612fc3e072d83fd
---
 core/java/android/app/KeyguardManager.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index e9c29b8aa0a5..c802d20a5a57 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -261,8 +261,10 @@ public class KeyguardManager {
             CharSequence title, CharSequence description, int userId,
             boolean disallowBiometricsIfPolicyExists) {
         Intent intent = this.createConfirmDeviceCredentialIntent(title, description, userId);
-        intent.putExtra(EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,
-                disallowBiometricsIfPolicyExists);
+        if (intent != null) {
+            intent.putExtra(EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,
+                    disallowBiometricsIfPolicyExists);
+        }
         return intent;
     }
 
-- 
cgit v1.2.3-59-g8ed1b