commit a2596ddf5e3de12cdc37164f492ba407b44973f8
author Nikita Ioffe <ioffe@google.com> Tue Apr 21 14:44:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 14:44:12 2020 +0000
tree dfce0fd3b0f1270c963df31618bac6d5e6639795
parent fcabee6875fa247f35b0b353c59a77a4215d4832
parent 4e1e7ef09a33d368ec41b76fd82fefd6f876aa6c

Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev am: 4e1e7ef09a

Change-Id: I1d4f16c45ac8082ae5c6aa7216a4636a32e0c0b7

KeyUtil.cpp

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index 3359699..acc42db 100644
--- a/KeyUtil.cpp
+++ b/KeyUtil.cpp
@@ -27,6 +27,7 @@
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
+#include <android-base/properties.h>
 #include <keyutils.h>
 
 #include <fscrypt_uapi.h>
@@ -87,6 +88,7 @@
             }
             LOG(DEBUG) << "Detected support for FS_IOC_ADD_ENCRYPTION_KEY";
             supported = true;
+            android::base::SetProperty("ro.crypto.uses_fs_ioc_add_encryption_key", "true");
         }
         // There's no need to check for FS_IOC_REMOVE_ENCRYPTION_KEY, since it's
         // guaranteed to be available if FS_IOC_ADD_ENCRYPTION_KEY is.  There's