summaryrefslogtreecommitdiff
path: root/runtime/base/mutex.h
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2013-08-14 22:33:15 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-08-14 22:33:15 -0700
commita7e8919e4aae44274f5427f11d74fe3bc045c9c7 (patch)
treef97684690083e2e54c1a64376e2565ff87563851 /runtime/base/mutex.h
parent5b2eece6aaa1c2e56ebb42240cd855bfd22a3a9e (diff)
parent2e250c826b3c405d675017efe79e5db3651c9ee6 (diff)
am 2e250c82: Revert "Always enable lock level checks."
* commit '2e250c826b3c405d675017efe79e5db3651c9ee6': Revert "Always enable lock level checks."
Diffstat (limited to 'runtime/base/mutex.h')
-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 0e5445f913..297a63d23b 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