diff options
| author | Josh Gao <jmgao@google.com> | 2018-03-19 13:20:29 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2018-03-21 15:13:07 -0700 |
| commit | 184f4805476af19c2e58dd96c2ce6aa241efaacf (patch) | |
| tree | 910d3b86985ca7bc9ad3544ba796a6e0a824875b /adb/socket_test.cpp | |
| parent | 1222abc75b7854979e6a9f982004985179bcbede (diff) | |
| download | system_core-184f4805476af19c2e58dd96c2ce6aa241efaacf.tar.gz system_core-184f4805476af19c2e58dd96c2ce6aa241efaacf.tar.bz2 system_core-184f4805476af19c2e58dd96c2ce6aa241efaacf.zip | |
adb: don't immediately close a socket when write fails.
When we fail to write to a local socket peer, we might still have data
queued up to send to the other side. Defer closing the socket until
we've failed to both read and write.
Bug: http://b/74616284
Test: python test_device.py
Change-Id: Ifc4b8fe95369b4872e475c2ae4ee611dd2d8b9d7
Diffstat (limited to 'adb/socket_test.cpp')
| -rw-r--r-- | adb/socket_test.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/adb/socket_test.cpp b/adb/socket_test.cpp index 44d327659..6b400565f 100644 --- a/adb/socket_test.cpp +++ b/adb/socket_test.cpp @@ -209,7 +209,6 @@ TEST_F(LocalSocketTest, write_error_when_having_packets) { TerminateThread(thread); } -#if 0 // Ensure that if we fail to write output to an fd, we will still flush data coming from it. TEST_F(LocalSocketTest, flush_after_shutdown) { int head_fd[2]; @@ -248,7 +247,6 @@ TEST_F(LocalSocketTest, flush_after_shutdown) { ASSERT_EQ(GetAdditionalLocalSocketCount(), fdevent_installed_count()); TerminateThread(thread); } -#endif #if defined(__linux__) |