Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"
This reverts commit 78f806198f85ca37abb617235c89abaca7d1c19c.
There is no code that reads this system property, logcat already shows
whether the FS keyring is being used, and all devices launching with
Android 11 and later are guaranteed to use the FS keyring anyway.
Bug: 154327249
Change-Id: Id906efedd89d5bcac5370fb141cdbf7848932d95
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;
}