am 37e232dc: am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev

* commit '37e232dc9cf867a81db92988f5f014ef573e3f97': Use native brige only if we have a private data directory.
2014-10-30 23:59:30 +00:00
parent c147077480 37e232dc9c
commit 100a33bd38
1 changed files with 0 additions and 4 deletions
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -418,10 +418,6 @@ 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;