diff options
| author | 2015-11-17 13:50:21 +0000 | |
|---|---|---|
| committer | 2015-11-18 10:50:47 +0000 | |
| commit | ba69a51724d33444064443e456ce78b71db2fd16 (patch) | |
| tree | a7e1b95026fb455077a4faeffebb76c4ff8d0d7e /runtime/runtime.h | |
| parent | f5dd91e0461b5bb0f401a51dee39f92d52b375e7 (diff) | |
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
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index 386d88f16e..d61663cd10 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -447,7 +447,7 @@ class Runtime { void PreZygoteFork(); bool InitZygote(); - void DidForkFromZygote(JNIEnv* env, NativeBridgeAction action, const char* isa); + void InitNonZygoteOrPostFork(JNIEnv* env, NativeBridgeAction action, const char* isa); const instrumentation::Instrumentation* GetInstrumentation() const { return &instrumentation_; |