Merge "The VM handles blocking SIGPIPE." into klp-dev (f4799069) · Commits · e / os / android_frameworks_base

core/jni/AndroidRuntime.cpp

+0 −15

Original line number	Diff line number	Diff line
		@@ -371,19 +371,6 @@ static int hasDir(const char* dir)
		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.
		*/
		@@ -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.