summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2013-08-21 23:57:59 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-08-21 23:57:59 +0000
commitf479906939ad463feb50a3edaabb2aa77d100723 (patch)
treed62f71911cd5aae4e8a550eaf22cde58b5194958
parent21ea2d0387e07569b3448c1161a3276599b3fbba (diff)
parentd7a90ca50c333008857c41118446cfc6b55735f9 (diff)
Merge "The VM handles blocking SIGPIPE." into klp-dev
-rw-r--r--core/jni/AndroidRuntime.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 9c323ba242bd..a17b301560bd 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -372,19 +372,6 @@ static int hasDir(const char* dir)
}
/*
- * We just want failed write() calls to just return with an error.
- */
-static void blockSigpipe()
-{
- sigset_t mask;
-
- sigemptyset(&mask);
- sigaddset(&mask, SIGPIPE);
- if (sigprocmask(SIG_BLOCK, &mask, NULL) != 0)
- ALOGW("WARNING: SIGPIPE not blocked\n");
-}
-
-/*
* Read the persistent locale.
*/
static void readLocale(char* language, char* region)
@@ -820,8 +807,6 @@ void AndroidRuntime::start(const char* className, const char* options)
ALOGD("\n>>>>>> AndroidRuntime START %s <<<<<<\n",
className != NULL ? className : "(unknown)");
- blockSigpipe();
-
/*
* 'startSystemServer == true' means runtime is obsolete and not run from
* init.rc anymore, so we print out the boot start event here.