diff --git a/init/builtins.cpp b/init/builtins.cpp index 9e1d93c6b..38f6f3939 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -426,7 +426,7 @@ static Result 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 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});