commit 9bf9887c46dc0de3619d9ccd8e02cc0133046666
author Artur Satayev <satayev@google.com> Mon Nov 11 09:33:32 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 11 09:33:32 2019 -0800
tree 42a1502da51c7e4a606ef9e9068e5b49cb9db82e
parent 578eb6c459f3bf14bf52983601dc328f7352a0cc
parent 650c88903135760cd0375cd134d2401d7ce703ce

Merge "Add @UnsupportedAppUsage annotations for greylist." am: 5f5576fe93
am: 650c889031

Change-Id: Ia971f31c4d83a52bf7ecbe9eea59f0790989141f

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;