Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1

Change-Id: Icfcf0222bd97d52d6fed2eeef3c3fca335d8b93e
This commit is contained in:
Treehugger Robot 2020-04-21 16:07:15 +00:00 committed by Automerger Merge Worker
commit ebcd59d19b

View file

@ -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 @@ bool isFsKeyringSupported(void) {
}
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