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 am: da9b7dcacc

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

Change-Id: I750207cd792e98487126b7d39231a78cc865a802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2022-04-28 13:40:48 +00:00
committed by Automerger Merge Worker
parent 2395639ead da9b7dcacc
commit aaf5eb43f1
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;
} }