From c5ab69469d53ffc5b55e91c5374da8b03dd4661c Mon Sep 17 00:00:00 2001
From: Bo Zhu <bozhu@google.com>
Date: Wed, 21 Mar 2018 14:33:15 -0700
Subject: [PATCH] Small fix for the key grant alias used in importKey

Bug: 74345822
Test: atest RecoveryControllerHostTest#testImportKey_ValidKey
Change-Id: I54812b3d7465ee508fe48886f5897470fe7455a0
---
 .../android/security/keystore/recovery/RecoveryController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/security/keystore/recovery/RecoveryController.java b/core/java/android/security/keystore/recovery/RecoveryController.java
index 10c1c9ee1b908..3e5ad976a9865 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) {