commit 0dd5171d50ce7686c67145f27cf78bd4d80c6f10
author Mark Salyzyn <salyzyn@google.com> Fri Mar 08 17:05:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 08 17:05:03 2019 +0000
tree c02733d3dcaaaae3b8064742d2fbb66dd0b059d7
parent 0c18bc43552e468f61d39e60110669e0b0d26673
parent 0949f5ebb2afc195d046a4b89560264525474465

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

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 40da36d..e61f588 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -769,9 +769,10 @@
 
     // 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