resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp. (aab0c1af) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,10 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
		pid_t pid = fork();

		if (pid == 0) {
		if (!is_system_server && dataDir == NULL) {
		ALOGE("Application private dir cannot be null");
		RuntimeAbort(env);
		}
		// The child process.
		gMallocLeakZygoteChild = 1;