Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev

am: 73b7722c13 Change-Id: I33b404ffc1e4554c3f3f76a4cd92d10fe4923761
2018-03-23 21:31:58 +00:00
parent 3af700538d 73b7722c13
commit 175f666461
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/security/keystore/recovery/RecoveryController.java
+++ b/core/java/android/security/keystore/recovery/RecoveryController.java
@@ -561,7 +561,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);