Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev

This commit is contained in:
Nikita Ioffe 2020-04-21 14:27:18 +00:00 committed by Android (Google) Code Review
commit 4e1e7ef09a

View file

@ -27,6 +27,7 @@
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/properties.h>
#include <keyutils.h> #include <keyutils.h>
#include <fscrypt_uapi.h> #include <fscrypt_uapi.h>
@ -87,6 +88,7 @@ bool isFsKeyringSupported(void) {
} }
LOG(DEBUG) << "Detected support for FS_IOC_ADD_ENCRYPTION_KEY"; LOG(DEBUG) << "Detected support for FS_IOC_ADD_ENCRYPTION_KEY";
supported = true; 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 // 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 // guaranteed to be available if FS_IOC_ADD_ENCRYPTION_KEY is. There's