Merge "Don't use TEMP_FAILURE_RETRY on close()" into mnc-dev

1 files changed, 3 insertions, 3 deletions

diff --git a/base/file.cpp b/base/file.cpp
index 6b19818e0..9a340b7f8 100644
--- a/base/file.cpp
+++ b/base/file.cpp
@@ -51,7 +51,7 @@ bool ReadFileToString(const std::string& path, std::string* content) {
     return false;
   }
   bool result = ReadFdToString(fd, content);
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return result;
 }
 
@@ -102,7 +102,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path,
     ALOGE("android::WriteStringToFile write failed: %s", strerror(errno));
     return CleanUpAfterFailedWrite(path);
   }
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return true;
 }
 #endif
@@ -116,7 +116,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path) {
   }
 
   bool result = WriteStringToFd(content, fd);
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return result || CleanUpAfterFailedWrite(path);
 }