diff options
| author | Yabin Cui <yabinc@google.com> | 2017-04-20 19:57:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-20 19:57:10 +0000 |
| commit | 1810d58e3581242cb34e78c0b0254774c4bee0d4 (patch) | |
| tree | 4b19251bfcff5371ee5e5f322636b5d4e461fb21 /adb/transport_local.cpp | |
| parent | 4ab7104b322f07e83459d59de68456cc8f30cbb5 (diff) | |
| parent | c4a1393a158f1c31801f2da57186563374859583 (diff) | |
| download | system_core-1810d58e3581242cb34e78c0b0254774c4bee0d4.tar.gz system_core-1810d58e3581242cb34e78c0b0254774c4bee0d4.tar.bz2 system_core-1810d58e3581242cb34e78c0b0254774c4bee0d4.zip | |
Merge "adb: fix two device offline problems." am: 2e821078e4 am: ae6a3605d2 am: 66cfd45a34
am: c4a1393a15
Change-Id: Ice92131cda4d9f421f0f62058a3867a918044d84
Diffstat (limited to 'adb/transport_local.cpp')
| -rw-r--r-- | adb/transport_local.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp index ab7c894e0..e5992b196 100644 --- a/adb/transport_local.cpp +++ b/adb/transport_local.cpp @@ -515,12 +515,11 @@ int init_socket_transport(atransport *t, int s, int adb_port, int local) int fail = 0; t->SetKickFunction(remote_kick); + t->SetWriteFunction(remote_write); t->close = remote_close; t->read_from_remote = remote_read; - t->write_to_remote = remote_write; t->sfd = s; t->sync_token = 1; - t->connection_state = kCsOffline; t->type = kTransportLocal; #if ADB_HOST |