Merge "Rename fscrypt_is_native() to IsFbeEnabled()" (e5a9a704) · Commits · e / os / android_system_core

init/builtins.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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});