| commit | 8778674cca0378182f9a60b4c915764edb46235c | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 18:29:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 18:29:50 2015 +0000 |
| tree | 26cf91de219461d0c519f2cb18ea1599c7ea754f | |
| parent | 6334bcdbc924c0caaf7db6beb5e9694b020032f4 [diff] | |
| parent | ff8b03972f1931340e64cc0e9d8b6eb08cecade9 [diff] |
am f3068123: Merge "adb: fix a fake data race on transport:kick reported by tsan." * commit 'f3068123039e81cee85ce9103d01b5b2aceb2ba3': 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;