openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()"

This commit is contained in:
Mark Salyzyn 2019-03-08 17:05:03 +00:00 committed by Gerrit Code Review
parent ecef987a35 27c5047313
commit 6c5c085e41
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs_mgr/fs_mgr_overlayfs.cpp
View File

@ -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