| commit | 9222cc684e7da51db4ba1466f46883c7ffe4ca9c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Nov 22 10:56:10 2019 -0800 |
| committer | Xin Li <delphij@google.com> | Fri Nov 22 14:05:35 2019 -0800 |
| tree | 7034edb93eaf596824b4e24b4685801fb64d217e | |
| parent | 3b518f4d9920a66ee0f214a6f1ba6748ae3f7a2f [diff] | |
| parent | ec8dc7f5b43b8e3cc9a592a8296303a7f8d36fb6 [diff] |
Merge QQ1A.191205.011 into stage-aosp-master Bug: 144955631 Merged-In: Ie6ce8f381affe89137c911b3964412a1c16fdb80 Change-Id: I53cad5f2e532ef4e7745df6e7cd55d17504ba62b
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;