commit bfb1f1cc832840b7232c25a91d49eb39aa79687f
author Elliott Hughes <enh@google.com> Fri May 15 17:05:40 2015 -0700
committer Elliott Hughes <enh@google.com> Fri May 15 17:26:44 2015 -0700
tree 1cd5d1310dcc0ad60dc2efb8831abd255f9bcad2
parent 2c237ee1d5961b9d11618e0c5a97b3bb7fb694b2

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

diff --git a/cmds/bugreport/bugreport.cpp b/cmds/bugreport/bugreport.cpp
index b606406..6892b57 100644
--- a/cmds/bugreport/bugreport.cpp
+++ b/cmds/bugreport/bugreport.cpp
@@ -86,6 +86,6 @@
     } while (bytes_written != 0 && bytes_to_send > 0);
   }
 
-  TEMP_FAILURE_RETRY(close(s));
+  close(s);
   return 0;
 }

cmds/dumpstate/utils.c

diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index 5801de1..d679787 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -290,7 +290,7 @@
             }
         }
     }
-    TEMP_FAILURE_RETRY(close(fd));
+    close(fd);
 
     if (!newline) printf("\n");
     if (title) printf("\n");