commit 0b6b18e707416371f57dd97d7fead4df302155ff
author Mathieu Chartier <mathieuc@google.com> Thu Jan 16 13:53:40 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Thu Jan 16 14:54:41 2014 -0800
tree e8ebb25cda441bf2b6453e329c1d19709e68ce51
parent 6e60cfd6d35ee7dbe68cee1ff2198d3b421ab686

Change lock ordering to prevent violation.

Violation previously occured in Thread_nativeHoldsLock.

Change-Id: I529552214eebfe7cf0779e62d8a601ca6751838b

runtime/locks.h

diff --git a/runtime/locks.h b/runtime/locks.h
index 9164be6..d4fbd91 100644
--- a/runtime/locks.h
+++ b/runtime/locks.h
@@ -51,6 +51,7 @@
   kJdwpObjectRegistryLock,
   kClassLinkerClassesLock,
   kBreakpointLock,
+  kMonitorLock,
   kThreadListLock,
   kBreakpointInvokeLock,
   kDeoptimizationLock,
@@ -60,7 +61,6 @@
   kJdwpAttachLock,
   kJdwpStartLock,
   kRuntimeShutdownLock,
-  kMonitorLock,
   kHeapBitmapLock,
   kMutatorLock,
   kZygoteCreationLock,