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

Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main am: 50e681b4ba am: 59e7388536

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705760

Change-Id: I922242eeb193b924e8f242f954d1935f9cafd749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers 2023-08-15 01:25:18 +00:00 committed by Automerger Merge Worker
commit 579643b765
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/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;
}