Re-enable the concurrent GC.

Change-Id: I1ddee8491788bb60371cdbadf25b53c65e012e0e

diff --git a/vm/Init.c b/vm/Init.c
index 4616114..d73bec7 100644 (file)
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -997,8 +997,7 @@ static int dvmProcessOptions(int argc, const char* const argv[],
             else if (strcmp(argv[i] + 5, "nopostverify") == 0)
                 gDvm.postVerify = false;
             else if (strcmp(argv[i] + 5, "concurrent") == 0)
-                /* FIXME: temp workaround - disable */
-                gDvm.concurrentMarkSweep = false;
+                gDvm.concurrentMarkSweep = true;
             else if (strcmp(argv[i] + 5, "noconcurrent") == 0)
                 gDvm.concurrentMarkSweep = false;
             else if (strcmp(argv[i] + 5, "verifycardtable") == 0)
@@ -1057,8 +1056,7 @@ static void setCommandLineDefaults()
     gDvm.heapSizeMax = 16 * 1024 * 1024;    // Spec says 75% physical mem
     gDvm.stackSize = kDefaultStackSize;
 
-    /* FIXME: temp workaround - default to false */
-    gDvm.concurrentMarkSweep = false;
+    gDvm.concurrentMarkSweep = true;
 
     /* gDvm.jdwpSuspend = true; */