ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: Fix misleading comment text regarding __ANDROID_RECOVERY__"

Browse source
This commit is contained in:
Yi-yo Chiang 2022-03-03 06:23:14 +00:00 • committed by Gerrit Code Review
commit fb81cf765a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -126,8 +126,12 @@ namespace {
bool fs_mgr_in_recovery() { bool fs_mgr_in_recovery() {
// Check the existence of recovery binary instead of using the compile time // Check the existence of recovery binary instead of using the compile time
// macro, because first-stage-init is compiled with __ANDROID_RECOVERY__ // __ANDROID_RECOVERY__ macro.
// defined, albeit not in recovery. More details: system/core/init/README.md // If BOARD_USES_RECOVERY_AS_BOOT is true, both normal and recovery boot
// mode would use the same init binary, which would mean during normal boot
// the '/init' binary is actually a symlink pointing to
// init_second_stage.recovery, which would be compiled with
// __ANDROID_RECOVERY__ defined.
return fs_mgr_access("/system/bin/recovery"); return fs_mgr_access("/system/bin/recovery");
} }