Adding null check to prevent NPE

#createConfirmDeviceCredentialIntent returns null if the device
is insecure.

Bug: 229950204
Test: atest StartActivityAsUserTests
Change-Id: I7de3e72d0677044e282952126612fc3e072d83fd
This commit is contained in:
Louis Chang
2022-04-25 13:14:12 +08:00
parent 1b43c023fa
commit 7fe81a61c5

View File

@@ -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;
}