summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-08-14 22:36:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-14 22:36:26 -0700
commitfbb0ba491042a7f8fb38f51b2f0538ca8fd074a6 (patch)
treea6ffcb9b0e9c8c0f7fee5da451a4527e7023e009
parentf80f2bc2541df590994d682145182f630edb9714 (diff)
parentec5683a4c79c3df6bec9329e59999bbc1e4a636a (diff)
downloadart-fbb0ba491042a7f8fb38f51b2f0538ca8fd074a6.zip
art-fbb0ba491042a7f8fb38f51b2f0538ca8fd074a6.tar.gz
art-fbb0ba491042a7f8fb38f51b2f0538ca8fd074a6.tar.bz2
am ec5683a4: am a7e8919e: am 2e250c82: Revert "Always enable lock level checks."
* commit 'ec5683a4c79c3df6bec9329e59999bbc1e4a636a': Revert "Always enable lock level checks."
-rw-r--r--runtime/base/mutex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index 0e5445f..297a63d 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -47,7 +47,7 @@ namespace art {
class ScopedContentionRecorder;
class Thread;
-const bool kDebugLocking = true || kIsDebugBuild;
+const bool kDebugLocking = kIsDebugBuild;
// Record Log contention information, dumpable via SIGQUIT.
#ifdef ART_USE_FUTEXES