commit de8da20454c1ac134ddc769a0df45ee3601b1495
author Shawn Willden <swillden@google.com> Wed Nov 20 13:14:16 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 20 13:14:16 2019 -0800
tree 7034edb93eaf596824b4e24b4685801fb64d217e
parent 72628c5986be827c437ccaf4357b2ae0ce7447e0
parent 3b3599385a88ae26fce0484c20a34cc911fed000

Merge "Don't clear kesytore after 5 auth failures." am: 44f4d85dcf
am: 3b3599385a

Change-Id: Ie6ce8f381affe89137c911b3964412a1c16fdb80

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;