commit 172b3113bf7f2f220b7f4fc72be0d442a49b61a4
author Mark Salyzyn <salyzyn@google.com> Fri Mar 08 10:02:35 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Mar 08 10:02:35 2019 -0800
tree eb433e4cfe4240d852619c80a208290795bf451e
parent 2144c6703e5e767465f930f9656d2884e49bacf8
parent 07503d3eef43e7abfde674c7e8f81a3a7125d920

Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" am: 6c5c085e41 am: bd15393281
am: 07503d3eef

Change-Id: I860abe7396e2b377c6c2f238cc6640f32a73cb91

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