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

am: f9332469a4 Change-Id: I43efcec91dc8c9e84cbefe2b0dcd7a089046cee3
2018-03-22 14:11:56 +00:00
parent 60efe8379d f9332469a4
commit 157aee22f5
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) {