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

Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: e5a9a70437

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

Change-Id: I2a019f1f512b213697fa1c795809efc2f18ad694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers 2022-06-22 18:47:33 +00:00 committed by Automerger Merge Worker
commit 3d3a52a7d4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/builtins.cpp
View file

@ -426,7 +426,7 @@ static Result<void> make_dir_with_options(const MkdirOptions& options) {
return ErrnoError() << "fchmodat() failed on " << options.target;
}
}
if (fscrypt_is_native()) {
if (IsFbeEnabled()) {
if (!FscryptSetDirectoryPolicy(ref_basename, options.fscrypt_action, options.target)) {
return reboot_into_recovery(
{"--prompt_and_wipe_data", "--reason=set_policy_failed:"s + options.target});
@ -1175,7 +1175,7 @@ static Result<void> ExecVdcRebootOnFailure(const std::string& vdc_arg) {
auto reboot = [reboot_reason, should_reboot_into_recovery](const std::string& message) {
// TODO (b/122850122): support this in gsi
if (should_reboot_into_recovery) {
if (fscrypt_is_native() && !android::gsi::IsGsiRunning()) {
if (IsFbeEnabled() && !android::gsi::IsGsiRunning()) {
LOG(ERROR) << message << ": Rebooting into recovery, reason: " << reboot_reason;
if (auto result = reboot_into_recovery(
{"--prompt_and_wipe_data", "--reason="s + reboot_reason});