From: Robert Berry <robertberry@google.com>
Date: Fri, 23 Mar 2018 08:08:02 +0000 (+0000)
Subject: Do not throw KeystoreException for when a key does not exist
X-Git-Tag: android-x86-9.0-r1~163^2~49^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=72f5755721ad22d4711e9e9cc8ef6107db91466a;p=android-x86%2Fframeworks-base.git

Do not throw KeystoreException for when a key does not exist

Bug: 75955240
Test: manual
Change-Id: Ibd2f4d7cd654752b69d2d22e803d4d1cc05c118f
---

diff --git a/core/java/android/security/keystore/recovery/RecoveryController.java b/core/java/android/security/keystore/recovery/RecoveryController.java
index 3e5ad976a986..f234cf944600 100644
--- a/core/java/android/security/keystore/recovery/RecoveryController.java
+++ b/core/java/android/security/keystore/recovery/RecoveryController.java
@@ -605,7 +605,7 @@ public class RecoveryController {
             throws InternalRecoveryServiceException, UnrecoverableKeyException {
         try {
             String grantAlias = mBinder.getKey(alias);
-            if (grantAlias == null) {
+            if (grantAlias == null || "".equals(grantAlias)) {
                 return null;
             }
             return getKeyFromGrant(grantAlias);