Merge "The VM handles blocking SIGPIPE."
This commit is contained in:
@@ -370,19 +370,6 @@ static int hasDir(const char* dir)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* 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.
|
* Read the persistent locale.
|
||||||
*/
|
*/
|
||||||
@@ -804,8 +791,6 @@ void AndroidRuntime::start(const char* className, const char* options)
|
|||||||
ALOGD("\n>>>>>> AndroidRuntime START %s <<<<<<\n",
|
ALOGD("\n>>>>>> AndroidRuntime START %s <<<<<<\n",
|
||||||
className != NULL ? className : "(unknown)");
|
className != NULL ? className : "(unknown)");
|
||||||
|
|
||||||
blockSigpipe();
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 'startSystemServer == true' means runtime is obsolete and not run from
|
* 'startSystemServer == true' means runtime is obsolete and not run from
|
||||||
* init.rc anymore, so we print out the boot start event here.
|
* init.rc anymore, so we print out the boot start event here.
|
||||||
|
|||||||
Reference in New Issue
Block a user