Disable CMS until bug(s) are fixed

CMS causes some check failures during phone bootup and art host tests.

Change-Id: I6c9d4ee6e9d729fca5d631565effbd585e26a3e4

1 files changed, 6 insertions, 3 deletions

diff --git a/src/heap.cc b/src/heap.cc
index 49657e0c32..22fb3ca1a6 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -306,8 +306,11 @@ Object* Heap::AllocObject(Class* c, size_t byte_count) {
     DCHECK_GE(byte_count, sizeof(Object));
     Object* obj = AllocateLocked(byte_count);
     if (obj != NULL) {
-      if (!is_gc_running_ && num_bytes_allocated_ >= concurrent_start_bytes_) {
-        RequestConcurrentGC();
+      // Disable CMS until bug is fixed
+      if (false) {
+        if (!is_gc_running_ && num_bytes_allocated_ >= concurrent_start_bytes_) {
+          RequestConcurrentGC();
+        }
       }
 
       obj->SetClass(c);
@@ -917,7 +920,7 @@ void Heap::ConcurrentGC() {
 }
 
 void Heap::Trim() {
-  ScopedHeapLock heap_lock;
+  lock_->AssertHeld();
   GetAllocSpace()->Trim();
 }