4 files changed, 24 insertions, 18 deletions
diff --git a/apps/SdkController/SdkControllerMultitouch/.classpath b/apps/SdkController/SdkControllerMultitouch/.classpath
index a4f1e40..57a5df6 100755
--- a/apps/SdkController/SdkControllerMultitouch/.classpath
+++ b/apps/SdkController/SdkControllerMultitouch/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/SdkControllerLib"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/apps/SdkController/SdkControllerMultitouch/AndroidManifest.xml b/apps/SdkController/SdkControllerMultitouch/AndroidManifest.xml
index 45f5f87..a8fb47f 100644
--- a/apps/SdkController/SdkControllerMultitouch/AndroidManifest.xml
+++ b/apps/SdkController/SdkControllerMultitouch/AndroidManifest.xml
@@ -33,7 +33,7 @@
             android:name=".SdkControllerMultitouchActivity"
             android:configChanges="orientation|keyboardHidden|mcc|mnc|locale|touchscreen|keyboard|navigation|screenLayout|fontScale"
             android:label="@string/app_name"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait" android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/apps/SdkController/SdkControllerMultitouch/res/values/strings.xml b/apps/SdkController/SdkControllerMultitouch/res/values/strings.xml
index 3db1f19..a0a6206 100644
--- a/apps/SdkController/SdkControllerMultitouch/res/values/strings.xml
+++ b/apps/SdkController/SdkControllerMultitouch/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">SDK Controller Multitouch</string>
+    <string name="app_name">Multitouch SDK Controller</string>
 
 </resources>
 \ No newline at end of file
diff --git a/apps/SdkController/SdkControllerMultitouch/src/com/android/tools/sdkcontroller/sdkcontrollermultitouch/SdkControllerMultitouchActivity.java b/apps/SdkController/SdkControllerMultitouch/src/com/android/tools/sdkcontroller/sdkcontrollermultitouch/SdkControllerMultitouchActivity.java
index 1318a68..9b6697c 100644
--- a/apps/SdkController/SdkControllerMultitouch/src/com/android/tools/sdkcontroller/sdkcontrollermultitouch/SdkControllerMultitouchActivity.java
+++ b/apps/SdkController/SdkControllerMultitouch/src/com/android/tools/sdkcontroller/sdkcontrollermultitouch/SdkControllerMultitouchActivity.java
@@ -17,7 +17,6 @@
 package com.android.tools.sdkcontroller.sdkcontrollermultitouch;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
@@ -29,6 +28,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnTouchListener;
 import android.view.WindowManager;
+import android.widget.Toast;
 
 import com.android.tools.sdkcontroller.lib.EmulatorConnection;
 import com.android.tools.sdkcontroller.lib.EmulatorConnection.EmulatorConnectionType;
@@ -131,15 +131,10 @@ public class SdkControllerMultitouchActivity extends Activity implements Emulato
         super.onResume();
 
         // Instantiate emulator connector.
-        try {
-            mEmulator = new EmulatorConnection(EmulatorConnection.MULTITOUCH_PORT,
-                                               EmulatorConnectionType.SYNC_CONNECTION,
-                                               this);
-        } catch (IOException e) {
-            Loge("Exception while creating server socket: " + e.getMessage());
-            finish();
-        }
-
+        // This will call onEmulatorBindResult with the result.
+        mEmulator = new EmulatorConnection(EmulatorConnection.MULTITOUCH_PORT,
+                                           EmulatorConnectionType.SYNC_CONNECTION,
+                                           this);
     }
 
     @Override
@@ -211,12 +206,22 @@ public class SdkControllerMultitouchActivity extends Activity implements Emulato
         }
 
         // Instantiate emulator connector for the next client.
-        try {
-            mEmulator = new EmulatorConnection(EmulatorConnection.MULTITOUCH_PORT,
-                                               EmulatorConnectionType.SYNC_CONNECTION,
-                                               this);
-        } catch (IOException e) {
-            Loge("Exception while recreating server socket: " + e.getMessage());
+        // This will call onEmulatorBindResult with the result.
+        mEmulator = new EmulatorConnection(EmulatorConnection.MULTITOUCH_PORT,
+                                           EmulatorConnectionType.SYNC_CONNECTION,
+                                           this);
+    }
+
+    /**
+     * Called with the result from {@code new EmulatorConnection}
+     */
+    @Override
+    public void onEmulatorBindResult(boolean success, Exception e) {
+        if (!success) {
+            String msg = "Failed to connect to server socket";
+            if (e != null) msg += ": " + e.toString();
+            Loge(msg);
+            Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
             finish();
         }
     }