Merge "ART: Fix allocation tracking"

1 files changed, 13 insertions, 0 deletions

diff --git a/runtime/java_vm_ext_test.cc b/runtime/java_vm_ext_test.cc
index 5db493b115..a15ec56274 100644
--- a/runtime/java_vm_ext_test.cc
+++ b/runtime/java_vm_ext_test.cc
@@ -163,6 +163,19 @@ TEST_F(JavaVmExtStackTraceTest, TestEnableDisable) {
 
   EXPECT_FALSE(Runtime::Current()->GetHeap()->IsAllocTrackingEnabled());
 
+  global_refs_.clear();
+  for (size_t i = 0; i < 2000; ++i) {
+    global_refs_.push_back(env->NewGlobalRef(local_ref));
+  }
+
+  EXPECT_TRUE(Runtime::Current()->GetHeap()->IsAllocTrackingEnabled());
+
+  for (jobject global_ref : global_refs_) {
+    env->DeleteGlobalRef(global_ref);
+  }
+
+  EXPECT_FALSE(Runtime::Current()->GetHeap()->IsAllocTrackingEnabled());
+
   ok = vm_->DetachCurrentThread();
   EXPECT_EQ(JNI_OK, ok);
 }