Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01f95d2e authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr: Fix misleading comment text regarding __ANDROID_RECOVERY__" am: fb81cf76

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

Change-Id: If382a3c6ef01c5f5ab6cbdaf78b67ae003fd00e1
parents d16229a5 fb81cf76
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -126,8 +126,12 @@ namespace {

bool fs_mgr_in_recovery() {
    // Check the existence of recovery binary instead of using the compile time
    // macro, because first-stage-init is compiled with __ANDROID_RECOVERY__
    // defined, albeit not in recovery. More details: system/core/init/README.md
    // __ANDROID_RECOVERY__ macro.
    // 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");
}