commit f81bfa3e21c8a4e031505470ea954c93949cb30b
author Mathieu Chartier <mathieuc@google.com> Mon Sep 08 13:35:11 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Sep 08 14:13:52 2014 -0700
tree 28599e4a9008b50a6eb17032d0224ce909509938
parent 4d3981c72a546b87c8f5d391ff8b5135b8ca99a7

Ignore heap trim requests if we are the zygote

Done to prevent app launching lag due to sleep in heap trimmer
daemon.

Bug: 17310019

Change-Id: Ia593e7eced1c1583771985ec9e7b60ee0c0e7912

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 4d8dbc8..46808d1 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -3017,7 +3017,10 @@
 
   Thread* self = Thread::Current();
   Runtime* runtime = Runtime::Current();
-  if (runtime == nullptr || !runtime->IsFinishedStarting() || runtime->IsShuttingDown(self)) {
+  if (runtime == nullptr || !runtime->IsFinishedStarting() || runtime->IsShuttingDown(self) ||
+      runtime->IsZygote()) {
+    // Ignore the request if we are the zygote to prevent app launching lag due to sleep in heap
+    // trimmer daemon. b/17310019
     // Heap trimming isn't supported without a Java runtime or Daemons (such as at dex2oat time)
     // Also: we do not wish to start a heap trim if the runtime is shutting down (a racy check
     // as we don't hold the lock while requesting the trim).