commit 58c34c21c27c8c2fb7eca78e9322bfbb6cc44cc1
author Roshan Pius <rpius@google.com> Tue Nov 26 13:41:41 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 26 13:41:41 2019 -0800
tree f2ec9d9a0da7a4f83383e084ed8807440ff2c261
parent 9222cc684e7da51db4ba1466f46883c7ffe4ca9c
parent be24e3f39036035049cf84010dc376cdd0d1a1cd

Merge "Revert "keystore: Allow network_stack uid to use AID_WIFI""
am: be24e3f390

Change-Id: Iceeecd170c1b5069f6052b21a7591687c54cd18b

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;