commit 72628c5986be827c437ccaf4357b2ae0ce7447e0
author Max Bires <jbires@google.com> Tue Nov 19 18:05:40 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 19 18:05:40 2019 -0800
tree ebf61044be7e8423fe24e3abac84178b0863672f
parent 8b549b192a691ae68a48825a7c4d06a322ffd542
parent c8c38ccaa407148383139748519617926d0ed854

Merge "Removing unused function reset()" am: 5a053ab455
am: c8c38ccaa4

Change-Id: Ib41fc76d56397fcc456b313dcae4460077347418

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;