summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bo Zhu <bozhu@google.com> 2018-03-21 14:33:15 -0700
committer Bo Zhu <bozhu@google.com> 2018-03-21 23:46:20 +0000
commitc5ab69469d53ffc5b55e91c5374da8b03dd4661c (patch)
treed1cb56e268d730403e6419c41b8056893cca7257
parentdc5677336c35c44e26592dfeefe160a4a9c4bbe0 (diff)
Small fix for the key grant alias used in importKey
Bug: 74345822 Test: atest RecoveryControllerHostTest#testImportKey_ValidKey Change-Id: I54812b3d7465ee508fe48886f5897470fe7455a0
-rw-r--r--core/java/android/security/keystore/recovery/RecoveryController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/security/keystore/recovery/RecoveryController.java b/core/java/android/security/keystore/recovery/RecoveryController.java
index 10c1c9ee1b90..3e5ad976a986 100644
--- a/core/java/android/security/keystore/recovery/RecoveryController.java
+++ b/core/java/android/security/keystore/recovery/RecoveryController.java
@@ -578,7 +578,7 @@ public class RecoveryController {
if (grantAlias == null) {
throw new InternalRecoveryServiceException("Null grant alias");
}
- return getKeyFromGrant(alias);
+ return getKeyFromGrant(grantAlias);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
} catch (UnrecoverableKeyException e) {