From bfb1f1cc832840b7232c25a91d49eb39aa79687f Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 15 May 2015 17:05:40 -0700
Subject: [PATCH] Don't use TEMP_FAILURE_RETRY on close in frameworks/native.

Bug: http://b/20501816
Change-Id: Id13a62f02243c6c4831e2f47944dc34fa822f5b6
(cherry picked from commit 997abb668b9248c2174c6cf169a0b7c6a02fd2cb)
---
 cmds/bugreport/bugreport.cpp | 2 +-
 cmds/dumpstate/utils.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmds/bugreport/bugreport.cpp b/cmds/bugreport/bugreport.cpp
index b606406df..6892b57f8 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 5801de191..d67978796 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -290,7 +290,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");