Merge "Correct the keystore alias used for secure imports" into pi-dev

am: 143c65d520 Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3
2018-06-27 22:16:49 -07:00
parent 69baf0d2a4 143c65d520
commit bd3440cac9
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,