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

This commit is contained in:
Eric Biggers 2023-08-14 20:54:30 +00:00 committed by Gerrit Code Review
commit 50e681b4ba

View file

@ -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 @@ static bool isFsKeyringSupportedImpl() {
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;
}