summaryrefslogtreecommitdiffstats
path: root/adb/transport_test.cpp
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2017-03-10 16:01:01 -0800
committerYabin Cui <yabinc@google.com>2017-04-20 10:14:59 -0700
commitb5e11415d9fdb929321c66889063dac50fb737af (patch)
tree3681eb198bd0e29998bb58c2c85fb3a94384a509 /adb/transport_test.cpp
parent82bd278dc4ed6e62b0aebec84cb2bde793823b35 (diff)
downloadsystem_core-b5e11415d9fdb929321c66889063dac50fb737af.tar.gz
system_core-b5e11415d9fdb929321c66889063dac50fb737af.tar.bz2
system_core-b5e11415d9fdb929321c66889063dac50fb737af.zip
adb: fix two device offline problems.
When device goes offline, user usually has to manually replug the usb device. This patch tries to solve two offline situations, all because when adb on host is killed, the adbd on device is not notified. 1. When adb server is killed while pushing a large file to device, the device is still reading the unfinished large message. So the device thinks of the CNXN message as part of the previous unfinished message, so it doesn't reply and the device is in offline state. The solution is to add a write_msg_lock in atransport struct. And it kicks the transport only after sending a whole message. By kicking all transports before exit, we ensure that we don't write part of a message to any device. So next time we start adb server, the device should be waiting for a new message. 2. When adb server is killed while pulling a large file from device, the device is still trying to send the unfinished large message. So adb on host usually reads data with EOVERFLOW error. This is because adb on host is reading less than one packet sent from device. The solution is to use buffered read on host. The max packet size of bulk transactions in USB 3.0 is 1024 bytes. By preparing an at least 1024 bytes buffer when reading, EOVERFLOW no longer occurs. And teach adb host to ignore wrong messages. To be safe, this patch doesn't change any logic on device. Bug: http://b/32952319 Test: run python -m unittest -q test_device.DeviceOfflineTest Test: on linux/mac/windows with bullhead, ryu. Change-Id: Ib149d30028a62a6f03857b8a95ab5a1d6e9b9c4e
Diffstat (limited to 'adb/transport_test.cpp')
-rw-r--r--adb/transport_test.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/adb/transport_test.cpp b/adb/transport_test.cpp
index 8b38e0334..68689d4a6 100644
--- a/adb/transport_test.cpp
+++ b/adb/transport_test.cpp
@@ -94,12 +94,13 @@ TEST(transport, SetFeatures) {
}
TEST(transport, parse_banner_no_features) {
+ set_main_thread();
atransport t;
parse_banner("host::", &t);
ASSERT_EQ(0U, t.features().size());
- ASSERT_EQ(kCsHost, t.connection_state);
+ ASSERT_EQ(kCsHost, t.GetConnectionState());
ASSERT_EQ(nullptr, t.product);
ASSERT_EQ(nullptr, t.model);
@@ -113,7 +114,7 @@ TEST(transport, parse_banner_product_features) {
"host::ro.product.name=foo;ro.product.model=bar;ro.product.device=baz;";
parse_banner(banner, &t);
- ASSERT_EQ(kCsHost, t.connection_state);
+ ASSERT_EQ(kCsHost, t.GetConnectionState());
ASSERT_EQ(0U, t.features().size());
@@ -130,7 +131,7 @@ TEST(transport, parse_banner_features) {
"features=woodly,doodly";
parse_banner(banner, &t);
- ASSERT_EQ(kCsHost, t.connection_state);
+ ASSERT_EQ(kCsHost, t.GetConnectionState());
ASSERT_EQ(2U, t.features().size());
ASSERT_TRUE(t.has_feature("woodly"));