commit 22c6a817ed3019455d22df13bd91faf012177ef6
author Stephen Hines <srhines@google.com> Wed Jul 16 11:03:43 2014 -0700
committer Stephen Hines <srhines@google.com> Wed Jul 16 11:03:43 2014 -0700
tree 848bc2d45509c925d89d1f1a11540fa413dba3c5
parent b5f5649ba4c8cb51ce143ddbedd5e1549f08f8b3

Add back a deleted check related to verification.

Change-Id: Ib939d1a7395a4b6cc9a7256cfb0a3498ba296744

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 1e053eb..03baba0 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -1053,6 +1053,10 @@
 }
 
 void Heap::VerifyObjectBody(mirror::Object* obj) {
+  if (verify_object_mode_ == kVerifyObjectModeDisabled) {
+    return;
+  }
+
   // Ignore early dawn of the universe verifications.
   if (UNLIKELY(static_cast<size_t>(num_bytes_allocated_.LoadRelaxed()) < 10 * KB)) {
     return;