| commit | 6bb1c31d3cf9b5f297c69064847ac8bf3b4eea17 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 03 23:14:57 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 03 23:14:57 2019 +0000 |
| tree | f2ec9d9a0da7a4f83383e084ed8807440ff2c261 | |
| parent | be24e3f39036035049cf84010dc376cdd0d1a1cd [diff] | |
| parent | f910c8ef67f4432b7f6a48d26bbb7fb31d2fa853 [diff] |
Merge "Merge Android10 QPR1 into AOSP master"
diff --git a/keystore/blob.cpp b/keystore/blob.cpp index 8626281..ffdb454 100644 --- a/keystore/blob.cpp +++ b/keystore/blob.cpp
@@ -219,7 +219,7 @@ mBlob->version = CURRENT_BLOB_VERSION; mBlob->type = uint8_t(type); - if (type == TYPE_MASTER_KEY) { + if (type == TYPE_MASTER_KEY || type == TYPE_MASTER_KEY_AES256) { mBlob->flags = KEYSTORE_FLAG_ENCRYPTED; } else { mBlob->flags = KEYSTORE_FLAG_NONE;