diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-19 11:11:07 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-19 11:11:07 -0700 |
| commit | fbf49d27f4a4e74c5901899a1c4879946b7bdf4e (patch) | |
| tree | 5e688c44ad579e1c655f328627c11543d6263eec /runtime/jdwp | |
| parent | bbf8a09601f5379293b498b7d181ffc2a1f93b6a (diff) | |
| parent | 50af979315413e7941ee553ad69c7ccc7d984621 (diff) | |
| download | art-fbf49d27f4a4e74c5901899a1c4879946b7bdf4e.zip art-fbf49d27f4a4e74c5901899a1c4879946b7bdf4e.tar.gz art-fbf49d27f4a4e74c5901899a1c4879946b7bdf4e.tar.bz2 | |
resolved conflicts for merge of 50af9793 to dalvik-dev
Change-Id: I13e7db2b4d4340d2c1a9994a4c6277f04e19d9fb
Diffstat (limited to 'runtime/jdwp')
| -rw-r--r-- | runtime/jdwp/jdwp_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/jdwp/jdwp_event.cc b/runtime/jdwp/jdwp_event.cc index 77434e1..52dd782 100644 --- a/runtime/jdwp/jdwp_event.cc +++ b/runtime/jdwp/jdwp_event.cc @@ -1070,7 +1070,7 @@ void JdwpState::DdmSendChunkV(uint32_t type, const iovec* iov, int iov_count) { Thread* self = Thread::Current(); bool safe_to_release_mutator_lock_over_send = !Locks::mutator_lock_->IsExclusiveHeld(self); if (safe_to_release_mutator_lock_over_send) { - for (size_t i=0; i < kMutatorLock; ++i) { + for (size_t i = 0; i < kMutatorLock; ++i) { if (self->GetHeldMutex(static_cast<LockLevel>(i)) != NULL) { safe_to_release_mutator_lock_over_send = false; break; |