Merge "Small fix for the key grant alias used in importKey" into pi-dev

2018-03-22 13:55:31 +00:00
parent 98ea60c427 c5ab69469d
commit f9332469a4
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
@@ -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) {