Merge "Fix broken logging in Zygote.cpp." (fbb0ab02) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+5 −7

Original line number	Diff line number	Diff line
		@@ -92,14 +92,10 @@ static void SigChldHandler(int /signal_number/) {
		if (WIFEXITED(status)) {
		if (WEXITSTATUS(status)) {
		ALOGI("Process %d exited cleanly (%d)", pid, WEXITSTATUS(status));
		} else if (false) {
		ALOGI("Process %d exited cleanly (%d)", pid, WEXITSTATUS(status));
		}
		} else if (WIFSIGNALED(status)) {
		if (WTERMSIG(status) != SIGKILL) {
		ALOGI("Process %d exited cleanly (%d)", pid, WTERMSIG(status));
		} else if (false) {
		ALOGI("Process %d exited cleanly (%d)", pid, WTERMSIG(status));
		ALOGI("Process %d exited due to signal (%d)", pid, WTERMSIG(status));
		}
		#ifdef WCOREDUMP
		if (WCOREDUMP(status)) {
		@@ -117,8 +113,10 @@ static void SigChldHandler(int /signal_number/) {
		}
		}

		if (pid < 0) {
		ALOGW("Zygote SIGCHLD error in waitpid: %d", errno);
		// Note that we shouldn't consider ECHILD an error because
		// the secondary zygote might have no children left to wait for.
		if (pid < 0 && errno != ECHILD) {
		ALOGW("Zygote SIGCHLD error in waitpid: %s", strerror(errno));
		}
		}