diff options
author | Steven Laver <lavers@google.com> | 2019-12-12 15:29:36 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-12 15:29:36 +0000 |
commit | a239544c7b06814b70fd970de7eaac234682fa52 (patch) | |
tree | a4298d61f9b73642f350799b1157e49b65f4e1e8 /adb/sockets.cpp | |
parent | 63de1e1c8d7824c241f22de67edf54f4f1eaeea5 (diff) | |
parent | 5319412e5305a3b4bcecf251a2955c09a6e9837e (diff) |
Merge "Merge RP1A.191203.001" into r-keystone-qcom-dev
Diffstat (limited to 'adb/sockets.cpp')
-rw-r--r-- | adb/sockets.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/adb/sockets.cpp b/adb/sockets.cpp index e78530c18..7d5bf17c7 100644 --- a/adb/sockets.cpp +++ b/adb/sockets.cpp @@ -125,8 +125,7 @@ static SocketFlushResult local_socket_flush_incoming(asocket* s) { if (rc > 0 && static_cast<size_t>(rc) == s->packet_queue.size()) { s->packet_queue.clear(); } else if (rc > 0) { - // TODO: Implement a faster drop_front? - s->packet_queue.take_front(rc); + s->packet_queue.drop_front(rc); fdevent_add(s->fde, FDE_WRITE); return SocketFlushResult::TryAgain; } else if (rc == -1 && errno == EAGAIN) { |