| commit | f6cee89b638acb53413e4cb9db1c19eac5cf3c97 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 18:34:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 18:34:50 2015 +0000 |
| tree | 047d9cc6c4f5d96ac01740f9f780a12716555aa9 | |
| parent | 03e770e9d401462ebe3af4e803f0ab2b329ffe39 [diff] | |
| parent | 9f91681d5025a22851d7f666bc574a0a9d445281 [diff] |
am 9f91681d: am f3068123: Merge "adb: fix a fake data race on transport:kick reported by tsan." * commit '9f91681d5025a22851d7f666bc574a0a9d445281': adb: fix a fake data race on transport:kick reported by tsan.
diff --git a/adb/transport.cpp b/adb/transport.cpp index 5e4ffbb..20d5d71 100644 --- a/adb/transport.cpp +++ b/adb/transport.cpp
@@ -43,7 +43,7 @@ void kick_transport(atransport* t) { - if (t && !t->kicked) + if (t != nullptr) { int kicked;