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

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

Change-Id: I8d2d3e82d790f7775d287863c6b29520b7f86fea
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:52:50 +00:00
committed by Automerger Merge Worker
parent 759b35a26a aaf5eb43f1
commit bb9a40aa6d
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,
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;
}