Handle null case KeyChain getPredefinedAliasForPackageAndUri
Bug: 177999278
Test: Manual testing
Manual Testing Steps:
* Install TestDPC
* Select 'Request to manage credentials'
* Select 'OK' then 'Allow'
* Select 'Install a private/public key pair'
* Select a certificate and enter name 'testAlias'
* Select 'Remove a private/public key pair'
* Verify NullPointerException is not thrown
Change-Id: If8019baeab90ca75e701482b3090c041147f5a89
diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 172746c..f96efa8 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -794,10 +794,10 @@
@Nullable
@Override
public String getPredefinedAliasForPackageAndUri(@NonNull String packageName,
- @NonNull Uri uri) {
+ @Nullable Uri uri) {
checkSystemCaller();
synchronized (mCredentialManagementAppLock) {
- if (mCredentialManagementApp == null) {
+ if (mCredentialManagementApp == null || uri == null) {
return null;
}
Map<Uri, String> urisToAliases = mCredentialManagementApp.getAuthenticationPolicy()
