commit 94c3164c76c26d0a2104a944f051c76f781d3b7d
author Roshan Pius <rpius@google.com> Tue Oct 29 16:48:43 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 29 16:48:43 2019 -0700
tree fb141c8d4b17a454d46e55d23151d2b6fb91da73
parent 05e6c2f61480eb74f06d1f826fa6c9e738559fa3
parent 29f46c493b42cec9b07ce3ab29e5e002df18b742

Merge "keystore: Move wifi keystore HAL service out" am: 2c62e2b83e
am: 29f46c493b

Change-Id: I025f25e02e25d31dd2d342359a75a38a0870a9ff

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;