diff options
| author | Robert Berry <robertberry@google.com> | 2018-03-22 13:55:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-22 13:55:31 +0000 |
| commit | f9332469a4a575f75852fe04e3e17f7386b53b8a (patch) | |
| tree | 94a07835398f6860075ca6f6af5f02e6da1bf802 /core/java | |
| parent | 98ea60c42766e973eb787a55a9b84ca91981c9e0 (diff) | |
| parent | c5ab69469d53ffc5b55e91c5374da8b03dd4661c (diff) | |
Merge "Small fix for the key grant alias used in importKey" into pi-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/security/keystore/recovery/RecoveryController.java | 2 |
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) { |