commit ba69a51724d33444064443e456ce78b71db2fd16
author Nicolas Geoffray <ngeoffray@google.com> Tue Nov 17 13:50:21 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Nov 18 10:50:47 2015 +0000
tree a7e1b95026fb455077a4faeffebb76c4ff8d0d7e
parent f5dd91e0461b5bb0f401a51dee39f92d52b375e7

Fix bogus DCHECK and rename DidForkFromZygote.

The method can also be called for non-zygote forked processes.

(cherry picked from commit 9d157e48e0abc48f08fd98e4c5e918d029c1b84c)

Change-Id: Id4f57b77c1a7f802f80e066afcf30afecc198bfc

runtime/native/dalvik_system_ZygoteHooks.cc

diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc
index bd23d70..ae1a4d7 100644
--- a/runtime/native/dalvik_system_ZygoteHooks.cc
+++ b/runtime/native/dalvik_system_ZygoteHooks.cc
@@ -181,9 +181,9 @@
     if (isa != kNone && isa != kRuntimeISA) {
       action = Runtime::NativeBridgeAction::kInitialize;
     }
-    Runtime::Current()->DidForkFromZygote(env, action, isa_string.c_str());
+    Runtime::Current()->InitNonZygoteOrPostFork(env, action, isa_string.c_str());
   } else {
-    Runtime::Current()->DidForkFromZygote(env, Runtime::NativeBridgeAction::kUnload, nullptr);
+    Runtime::Current()->InitNonZygoteOrPostFork(env, Runtime::NativeBridgeAction::kUnload, nullptr);
   }
 }