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

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

Browse source
This commit is contained in:
Mark Salyzyn 2019-03-08 17:05:03 +00:00 • committed by Gerrit Code Review
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! // in recovery, fastbootd, or gsi mode, not allowed!
if (fs_mgr_access("/system/bin/recovery")) return true; if (fs_mgr_access("/system/bin/recovery")) return true;
if (android::gsi::IsGsiRunning()) return true; auto save_errno = errno;
auto ret = android::gsi::IsGsiRunning();
return false; errno = save_errno;
return ret;
} }
} // namespace } // namespace