summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-03-27 18:00:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-27 18:00:47 -0700
commit9bffe7cc708802f20bd8790c99cc68a6b721eba8 (patch)
tree81d372dd98aa318ce5c3f77c8ea66eb922bebcbe
parent874b6e182d68a14181ca8aea5bee3c832ebb1d39 (diff)
parentb9f5c7aa88c3c731501bd1c61baefa5c761947a1 (diff)
downloaddalvik-9bffe7cc708802f20bd8790c99cc68a6b721eba8.tar.gz
am b9f5c7aa: am 3ddb30bd: am 6bcf5d20: Merge "Obvious mix of = and =="
* commit 'b9f5c7aa88c3c731501bd1c61baefa5c761947a1': Obvious mix of = and ==
-rw-r--r--vm/jdwp/JdwpEvent.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/jdwp/JdwpEvent.cpp b/vm/jdwp/JdwpEvent.cpp
index 539aa92ff..27934872e 100644
--- a/vm/jdwp/JdwpEvent.cpp
+++ b/vm/jdwp/JdwpEvent.cpp
@@ -920,7 +920,7 @@ bool dvmJdwpPostThreadChange(JdwpState* state, ObjectId threadId, bool start)
{
JdwpSuspendPolicy suspendPolicy = SP_NONE;
- assert(threadId = dvmDbgGetThreadSelfId());
+ assert(threadId == dvmDbgGetThreadSelfId());
/*
* I don't think this can happen.