Merge "Correct the keystore alias used for secure imports" into pi-dev am: 143c65d520

am: bd3440cac9 Change-Id: I84b68a7caa793c776140cdd2bd79b5b76c63ddd3
2018-06-27 22:43:43 -07:00
parent ac05a1b791 bd3440cac9
commit 23164924a9
1 changed files with 1 additions and 1 deletions
--- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
@@ -811,7 +811,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
        }

        int errorCode = mKeyStore.importWrappedKey(
-            Credentials.USER_SECRET_KEY + alias,
+            Credentials.USER_PRIVATE_KEY + alias,
            entry.getWrappedKeyBytes(),
            Credentials.USER_PRIVATE_KEY + entry.getWrappingKeyAlias(),
            maskingKey,