commit 41aea21a28e32c6b373bfef7e5f6b4f5d0b90cff
author Xin Li <delphij@google.com> Fri Nov 22 11:13:59 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 22 11:13:59 2019 -0800
tree 7034edb93eaf596824b4e24b4685801fb64d217e
parent de8da20454c1ac134ddc769a0df45ee3601b1495
parent 3b518f4d9920a66ee0f214a6f1ba6748ae3f7a2f

DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master
am: 3b518f4d99

Change-Id: If3e68655ddf822850d5f95de9a83d5ccc209095d

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;