commit 3a6ef94d9e756449c490a535962760744e94f458
author Mathieu Chartier <mathieuc@google.com> Wed Dec 18 11:04:42 2019 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Jan 06 18:31:18 2020 +0000
tree 310a1d62711b51d34c41066e556996da07d4c107
parent 0010172c7ff79a3af75669f1ff49d5f97e867746

Disable jitzygote polling thread

Disable jitzygote polling thread until possible ANR issues are
resolved.

Bug: 139883463
Bug: 145973776
Test: adb shell setprop dalvik.vm.profilebootclasspath true
Test: adb shell setprop dalvik.vm.profilesystemserver true
Test: restart shell and verify no stability issues

Change-Id: Ia688c9c1df9fb1cc2777063641fd86171bbb181d

runtime/jit/jit.cc

diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index d94e600..285cfee 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -1636,7 +1636,10 @@
     tasks_after_boot_.clear();
   }
 
-  if (Runtime::Current()->IsUsingApexBootImageLocation() && fd_methods_ != -1) {
+  // Disable polling thread until b/145973776 is fixed.
+  static constexpr bool kRunPollingThread = false;
+  Runtime* const runtime = Runtime::Current();
+  if (kRunPollingThread && runtime->IsUsingApexBootImageLocation() && fd_methods_ != -1) {
     // Create a thread that will poll the status of zygote compilation, and map
     // the private mapping of boot image methods.
     zygote_mapping_methods_.ResetInForkedProcess();
@@ -1651,7 +1654,7 @@
         "Methods maps thread");
   }
 
-  if (is_zygote || Runtime::Current()->IsSafeMode()) {
+  if (is_zygote || runtime->IsSafeMode()) {
     // Delete the thread pool, we are not going to JIT.
     thread_pool_.reset(nullptr);
     return;