From 8f88207206fe39f6dcb4e76e24716c81566f26cc Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Tue, 9 Apr 2019 20:11:19 +0000
Subject: Revert "Remove support for moving GC collector transitions"

This reverts commit 66a655029c98de9492570f4cfd06476c0fde9cd1.

Bug: 78286368
Bug: 130236304

Reason for revert: Causes tombstones in AOSP walleye

Change-Id: I41c27d119f82490b68a01f85d92d22d0961d2af6
---
 test/1337-gc-coverage/gc_coverage.cc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'test/1337-gc-coverage/gc_coverage.cc')

diff --git a/test/1337-gc-coverage/gc_coverage.cc b/test/1337-gc-coverage/gc_coverage.cc
index eb8ec0e0ca..ac959f68e8 100644
--- a/test/1337-gc-coverage/gc_coverage.cc
+++ b/test/1337-gc-coverage/gc_coverage.cc
@@ -46,5 +46,19 @@ extern "C" JNIEXPORT jlong JNICALL Java_Main_objectAddress(JNIEnv* env, jclass,
   return reinterpret_cast<jlong>(soa.Decode<mirror::Object>(object).Ptr());
 }
 
+extern "C" JNIEXPORT jboolean JNICALL Java_Main_supportCollectorTransition(JNIEnv*, jclass) {
+  // Same as supportHomogeneousSpaceCompact for now.
+  return Runtime::Current()->GetHeap()->SupportHomogeneousSpaceCompactAndCollectorTransitions() ?
+      JNI_TRUE : JNI_FALSE;
+}
+
+extern "C" JNIEXPORT void JNICALL Java_Main_transitionToSS(JNIEnv*, jclass) {
+  Runtime::Current()->GetHeap()->TransitionCollector(gc::kCollectorTypeSS);
+}
+
+extern "C" JNIEXPORT void JNICALL Java_Main_transitionToCMS(JNIEnv*, jclass) {
+  Runtime::Current()->GetHeap()->TransitionCollector(gc::kCollectorTypeCMS);
+}
+
 }  // namespace
 }  // namespace art
-- 
cgit v1.2.3-59-g8ed1b