Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
Limit maximum number of concurrent keystore operations.
Fix failure to save master key on new profile
Change-Id: Iec52f582e6e5f05adcc93004d2a53f9afe583ffc
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index e466466..8f276f5 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -1337,6 +1337,15 @@
if (keyBlob->getType() == TYPE_KEY_PAIR) {
keyBlob->setType(TYPE_KEYMASTER_10);
rc = this->put(filename, keyBlob, userId);
+ if (rc != NO_ERROR) {
+ return rc;
+ }
+
+ rc = keyBlob->readBlob(filename, userState->getDecryptionKey(),
+ userState->getState());
+ if (rc != NO_ERROR) {
+ return rc;
+ }
}
if (type != TYPE_ANY && keyBlob->getType() != type) {