commit 69dbec6d9d55eeb2867949c2791d01dc9aa916c8
author Jeff Hao <jeffhao@google.com> Mon Sep 15 18:03:41 2014 -0700
committer Jeff Hao <jeffhao@google.com> Wed Sep 17 14:31:55 2014 -0700
tree be4eca8161eafb4a8466f5adf28a2c8f27cd37d1
parent 926d8e99aa69151a271180299df68963688010d8

Avoid suspending for alloc trace enabling when already suspended.

Bug: 17499772

(cherry picked from commit 1d6ee090fddd4bfd35c304d6ceb929d5c529dfcc)

Change-Id: Id09809c476c685f0a197ee75bb08638931364efd

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 9b24bec..0e382ff 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -998,14 +998,14 @@
   }
 }
 
-void Runtime::SetStatsEnabled(bool new_state) {
+void Runtime::SetStatsEnabled(bool new_state, bool suspended) {
   if (new_state == true) {
     GetStats()->Clear(~0);
     // TODO: wouldn't it make more sense to clear _all_ threads' stats?
     Thread::Current()->GetStats()->Clear(~0);
-    GetInstrumentation()->InstrumentQuickAllocEntryPoints();
+    GetInstrumentation()->InstrumentQuickAllocEntryPoints(suspended);
   } else {
-    GetInstrumentation()->UninstrumentQuickAllocEntryPoints();
+    GetInstrumentation()->UninstrumentQuickAllocEntryPoints(suspended);
   }
   stats_enabled_ = new_state;
 }