commit 925af424659fd4c65a08f1cdf061fa0130f6bbaa
author android-build-team Robot <android-build-team-robot@google.com> Sat Oct 05 23:09:42 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Oct 05 23:09:42 2019 +0000
tree bc2a830603fa5eac10b4442df27ecaa7f01e9b85
parent 83aa272cae58ad2be32b946f5d4011abefcb07e8
parent 921d3a3678408af3598ef6bd8ec8f8afd4f6ee2e

Snap for 5922641 from 921d3a3678408af3598ef6bd8ec8f8afd4f6ee2e to qt-qpr2-release

Change-Id: Ie066d94f5f09427fefbf85c98755e26b3609246a

keystore/blob.cpp

diff --git a/keystore/blob.cpp b/keystore/blob.cpp
index eac8f11..497f304 100644
--- a/keystore/blob.cpp
+++ b/keystore/blob.cpp
@@ -228,7 +228,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;