Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Louis Chang
2022-04-28 13:33:43 +00:00
committed by Android (Google) Code Review
parent e2b3d4ec6b 7fe81a61c5
commit da9b7dcacc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/KeyguardManager.java
View File

@@ -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);
intent.putExtra(EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS, if (intent != null) {
disallowBiometricsIfPolicyExists); intent.putExtra(EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,
disallowBiometricsIfPolicyExists);
}
return intent; return intent;
} }