commit f910c8ef67f4432b7f6a48d26bbb7fb31d2fa853
author Xin Li <delphij@google.com> Mon Dec 02 21:25:27 2019 -0800
committer Xin Li <delphij@google.com> Mon Dec 02 21:25:27 2019 -0800
tree f2ec9d9a0da7a4f83383e084ed8807440ff2c261
parent be24e3f39036035049cf84010dc376cdd0d1a1cd
parent 58c34c21c27c8c2fb7eca78e9322bfbb6cc44cc1

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ie2c617a7c418e7d651ee491b6ec546bd2fa1a40a

keystore/blob.cpp

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;