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

Commit 172b3113 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" am: 6c5c085e am: bd153932 

am: 07503d3e

Change-Id: I860abe7396e2b377c6c2f238cc6640f32a73cb91
parents 2144c670 07503d3e

fs_mgr/fs_mgr_overlayfs.cpp

+4 −3
Original line number Diff line number Diff line
@@ -769,9 +769,10 @@ bool fs_mgr_overlayfs_invalid() { 


    // in recovery, fastbootd, or gsi mode, not allowed!

    if (fs_mgr_access("/system/bin/recovery")) return true;

    if (android::gsi::IsGsiRunning()) return true;



    return false;

    auto save_errno = errno;

    auto ret = android::gsi::IsGsiRunning();

    errno = save_errno;

    return ret;

}



}  // namespace