tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"

Browse source 
This reverts commit 78f806198f.

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
This commit is contained in:
Eric Biggers 2023-08-11 20:25:09 +00:00
parent d54caf0598
commit 2114e26501
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
KeyUtil.cpp
View file

@ -28,7 +28,6 @@
#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 "KeyStorage.h" #include "KeyStorage.h"
@ -99,7 +98,6 @@ static bool isFsKeyringSupportedImpl() {
PLOG(WARNING) << "Unexpected error from FS_IOC_ADD_ENCRYPTION_KEY"; PLOG(WARNING) << "Unexpected error from FS_IOC_ADD_ENCRYPTION_KEY";
} }
LOG(DEBUG) << "Detected support for 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; return true;
} }