| commit | bd3440cac92847119605f914678466b5de77f502 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Jun 27 22:16:49 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 27 22:16:49 2018 -0700 |
| tree | 92959b392cf1612607778eff5dc56bbdf31f96ea | |
| parent | 69baf0d2a42ced4157679c3dc3266de9c9ad61af [diff] | |
| parent | 143c65d520b197a271d6de282fc7759d8009ce44 [diff] |
Merge "Correct the keystore alias used for secure imports" into pi-dev am: 143c65d520 Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java index 2b5a37b..4c007cb 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
@@ -811,7 +811,7 @@ } int errorCode = mKeyStore.importWrappedKey( - Credentials.USER_SECRET_KEY + alias, + Credentials.USER_PRIVATE_KEY + alias, entry.getWrappedKeyBytes(), Credentials.USER_PRIVATE_KEY + entry.getWrappingKeyAlias(), maskingKey,