commit ec8dc7f5b43b8e3cc9a592a8296303a7f8d36fb6
author android-build-team Robot <android-build-team-robot@google.com> Fri Oct 11 02:37:27 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 11 02:37:27 2019 +0000
tree bc2a830603fa5eac10b4442df27ecaa7f01e9b85
parent 0d466c94a81eec5a701748ff7526a2e3515b3c97
parent c9349a5bf0d87a4b61f088a76d058b5dae0357dc

Merge cherrypicks of [9537713, 9537701, 9537702, 9537538, 9537180, 9537181, 9537182, 9537183, 9537764, 9537703, 9537784, 9537785, 9537714, 9537715, 9537716, 9537717, 9537786, 9537718, 9537719, 9537720, 9537721, 9537722, 9537787, 9537788, 9537723, 9537804, 9537805, 9537789] into qt-qpr1-release

Change-Id: Idf013f364d598acf6aadf48a1b0c45fc894e13a8

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;