1 files changed, 6 insertions, 7 deletions

diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/forwarder/ConnectionHandler.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/forwarder/ConnectionHandler.java
index 4f01dae..f19cd41 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/forwarder/ConnectionHandler.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/forwarder/ConnectionHandler.java
@@ -93,7 +93,8 @@ public class ConnectionHandler {
 
     private OnFinishedCallback mOnFinishedCallback;
 
-    public ConnectionHandler(String remoteMachineIp, int port, Socket fromSocket, Socket toSocket) {
+    public ConnectionHandler(String remoteMachineIp, int port, Socket fromSocket, Socket toSocket)
+            throws IOException {
         mRemoteMachineIpAddress = remoteMachineIp;
         mPort = port;
 
@@ -105,14 +106,12 @@ public class ConnectionHandler {
             mToSocketInputStream = mToSocket.getInputStream();
             mFromSocketOutputStream = mFromSocket.getOutputStream();
             mToSocketOutputStream = mToSocket.getOutputStream();
-            if (!AdbUtils.configureConnection(mToSocketInputStream, mToSocketOutputStream,
-                    mRemoteMachineIpAddress, mPort)) {
-                throw new IOException("Configuring socket failed!");
-            }
+            AdbUtils.configureConnection(mToSocketInputStream, mToSocketOutputStream,
+                    mRemoteMachineIpAddress, mPort);
         } catch (IOException e) {
             Log.e(LOG_TAG, "Unable to start ConnectionHandler", e);
             closeStreams();
-            return;
+            throw e;
         }
 
         mFromToPipe = new SocketPipeThread(mFromSocketInputStream, mToSocketOutputStream);
@@ -170,4 +169,4 @@ public class ConnectionHandler {
             }
         }
     }
-}
\ No newline at end of file
+}