commit 578eb6c459f3bf14bf52983601dc328f7352a0cc
author Xin Li <delphij@google.com> Wed Oct 30 15:57:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 15:57:31 2019 -0700
tree fb141c8d4b17a454d46e55d23151d2b6fb91da73
parent 94c3164c76c26d0a2104a944f051c76f781d3b7d
parent e7288511384498a2d3b7cc600cc182227a315bb0

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: e728851138

Change-Id: Ic254973d24812e380890aa1646dab95b2c3489c0

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;