[android] Don't attempt to read a command on failure to start the forwarder.

tools/android/forwarder2/host_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/android/forwarder2/host_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 105 matching lines @@
       return;
     }
     OnInternalThreadError();
     return;
   }
   LOG(INFO) << device_serial_
             << ": Will send HOST_SERVER_SUCCESS: "
             << host_port_;
   SendCommand(
       command::HOST_SERVER_SUCCESS, device_port_, adb_control_socket_.get());
-  StartForwarder(std::move(host_server_data_socket));
+  if (!StartForwarder(std::move(host_server_data_socket))) {
+    OnInternalThreadError();
+    return;
+  }
   ReadNextCommandSoon();
 }
 
-void HostController::StartForwarder(
+bool HostController::StartForwarder(
     std::unique_ptr<Socket> host_server_data_socket) {
   std::unique_ptr<Socket> adb_data_socket(new Socket());
   if (!adb_data_socket->ConnectTcp("", adb_port_)) {
     LOG(ERROR) << device_serial_
                << ": Could not connect AdbDataSocket on port: "
                << adb_port_;
-    OnInternalThreadError();
-    return;
+    return false;
   }
   // Open the Adb data connection, and send a command with the
   // |device_forward_port| as a way for the device to identify the connection.
   SendCommand(command::DATA_CONNECTION, device_port_, adb_data_socket.get());
 
   // Check that the device received the new Adb Data Connection. Note that this
   // check is done through the |adb_control_socket_| that is handled in the
   // DeviceListener thread just after the call to WaitForAdbDataSocket().
   if (!ReceivedCommand(command::ADB_DATA_SOCKET_SUCCESS,
                        adb_control_socket_.get())) {
     LOG(ERROR) << device_serial_
                << ": Device could not handle the new Adb Data Connection.";
-    OnInternalThreadError();
-    return;
+    return false;
   }
   forwarders_manager_.CreateAndStartNewForwarder(
       std::move(host_server_data_socket), std::move(adb_data_socket));
+  return true;
 }
 
 void HostController::OnInternalThreadError() {
   UnmapPortOnDevice();
   self_deleter_helper_.MaybeSelfDeleteSoon();
 }
 
 void HostController::UnmapPortOnDevice() {
   Socket socket;
   if (!socket.ConnectTcp("", adb_port_)) {
@@ skipping 10 matching lines @@
   }
   if (!ReceivedCommand(command::UNLISTEN_SUCCESS, &socket)) {
     LOG(ERROR) << device_serial_
                << ": Unmap command failed for port "
                << device_port_;
     return;
   }
 }
 
 }  // namespace forwarder2