Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: tools/android/forwarder2/device_listener.cc

Issue 11269036: Support HTTP test-server based net unit tests on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove duplicate include Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/android/forwarder2/device_listener.cc
diff --git a/tools/android/forwarder2/device_listener.cc b/tools/android/forwarder2/device_listener.cc
index fdabc7076fed9c4ae7d583af42d681435c285482..f3a45879247a9bdbdbd36755223a50f5e299bd26 100644
--- a/tools/android/forwarder2/device_listener.cc
+++ b/tools/android/forwarder2/device_listener.cc
@@ -106,6 +106,8 @@ void DeviceListener::RunInternal() {
while (!must_exit_) {
scoped_ptr<Socket> device_data_socket(new Socket);
if (!listener_socket_.Accept(device_data_socket.get())) {
+ if (listener_socket_.exited())
+ break;
LOG(WARNING) << "Could not Accept in ListenerSocket.";
SendCommand(command::ACCEPT_ERROR,
listener_port_,
@@ -160,7 +162,8 @@ bool DeviceListener::BindListenerSocket() {
adb_control_socket_.get());
is_alive_ = true;
} else {
- LOG(ERROR) << "Device could not bind and listen to local port.";
+ LOG(ERROR) << "Device could not bind and listen to local port "
+ << listener_port_;
SendCommand(command::BIND_ERROR,
listener_port_,
adb_control_socket_.get());

Powered by Google App Engine
This is Rietveld 408576698