am e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native."

* commit 'e814b43c581b16e144328c405a003ffece9ebf4d':
  Don't use TEMP_FAILURE_RETRY on close in frameworks/native.

2 files changed, 2 insertions, 2 deletions

diff --git a/cmds/bugreport/bugreport.cpp b/cmds/bugreport/bugreport.cpp
index b606406df1..6892b57f88 100644
--- a/cmds/bugreport/bugreport.cpp
+++ b/cmds/bugreport/bugreport.cpp
@@ -86,6 +86,6 @@ int main() {
     } while (bytes_written != 0 && bytes_to_send > 0);
   }
 
-  TEMP_FAILURE_RETRY(close(s));
+  close(s);
   return 0;
 }
diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index 4fc23aa3c7..44ba025ca0 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -306,7 +306,7 @@ static int _dump_file_from_fd(const char *title, const char *path, int fd) {
             }
         }
     }
-    TEMP_FAILURE_RETRY(close(fd));
+    close(fd);
 
     if (!newline) printf("\n");
     if (title) printf("\n");