Merge "Zygote: Unblock SIGCHLD in the parent after fork." (01a96637) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -628,6 +628,12 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
		}
		} else if (pid > 0) {
		// the parent process

		// We blocked SIGCHLD prior to a fork, we unblock it here.
		if (sigprocmask(SIG_UNBLOCK, &sigchld, nullptr) == -1) {
		ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno));
		RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_UNBLOCK, { SIGCHLD }) failed.");
		}
		}
		return pid;
		}