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

Commit f4ce7c8f 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:... 

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

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

Change-Id: If5468df22df850ec664de6bd81dcb0aa7e00180f
parents ea3cc1d2 01f95d2e

fs_mgr/fs_mgr_overlayfs.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -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");

}

}