commit 50e681b4ba40b8dcf98ab4bce8231ca6ec069921
author Eric Biggers <ebiggers@google.com> Mon Aug 14 20:54:30 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 14 20:54:30 2023 +0000
tree 6ad48e4430dc61c5eb474952c62766b045e38043
parent 866faf55e3a6a6a068e2021fc6c33fe38c56697b
parent 2114e265019ba4365ba8fb9f8f93a7c054cf9b18

Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main

KeyUtil.cpp

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index 395b6b3..5a8b550 100644
--- a/KeyUtil.cpp
+++ b/KeyUtil.cpp
@@ -28,7 +28,6 @@
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
-#include <android-base/properties.h>
 #include <keyutils.h>
 
 #include "KeyStorage.h"
@@ -99,7 +98,6 @@
         PLOG(WARNING) << "Unexpected error from FS_IOC_ADD_ENCRYPTION_KEY";
     }
     LOG(DEBUG) << "Detected support for FS_IOC_ADD_ENCRYPTION_KEY";
-    android::base::SetProperty("ro.crypto.uses_fs_ioc_add_encryption_key", "true");
     return true;
 }