Add Experiment 2: Master recovery time.

3 files changed, 7 insertions, 5 deletions

diff --git a/same-android/src/main/java/com/orbekk/same/android/MainActivity.java b/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
index 7bd494e..dffc23a 100644
--- a/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
@@ -33,6 +33,7 @@ import android.widget.ListView;
 
 import com.orbekk.same.android.benchmark.ExampleProtobufServerActivity;
 import com.orbekk.same.android.benchmark.Experiment1Activity;
+import com.orbekk.same.android.benchmark.Experiment2Activity;
 import com.orbekk.same.android.benchmark.RepeatedSetVariableActivity;
 
 public class MainActivity extends Activity {
@@ -51,6 +52,7 @@ public class MainActivity extends Activity {
                 ExampleProtobufServerActivity.class);
         
         activities.put("Experiment 1", Experiment1Activity.class);
+        activities.put("Experiment 2", Experiment2Activity.class);
     }
     
     public final static List<String> activityList =
diff --git a/same-android/src/main/java/com/orbekk/same/android/SameService.java b/same-android/src/main/java/com/orbekk/same/android/SameService.java
index 21e0839..37f6e36 100644
--- a/same-android/src/main/java/com/orbekk/same/android/SameService.java
+++ b/same-android/src/main/java/com/orbekk/same/android/SameService.java
@@ -75,11 +75,11 @@ public class SameService extends Service {
 
     public final static int KILL_MASTER = 10;
 
-    final static int PPORT = 15070;
-    final static int SERVICE_PORT = 15068;
+    public final static int PPORT = 15070;
+    public final static int SERVICE_PORT = 15068;
     
-    final static String DIRECTORY_HOST = "flode.pvv.ntnu.no";
-    final static int DIRECTORY_PORT = 15072;
+    public final static String DIRECTORY_HOST = "flode.pvv.ntnu.no";
+    public final static int DIRECTORY_PORT = 15072;
 
     private Logger logger = LoggerFactory.getLogger(getClass());
     private SameController sameController = null;
diff --git a/same-android/src/main/java/com/orbekk/same/android/benchmark/Experiment1Activity.java b/same-android/src/main/java/com/orbekk/same/android/benchmark/Experiment1Activity.java
index 862e007..30ab37e 100644
--- a/same-android/src/main/java/com/orbekk/same/android/benchmark/Experiment1Activity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/benchmark/Experiment1Activity.java
@@ -144,7 +144,7 @@ public class Experiment1Activity extends Activity {
     }
     
     public void onPause() {
-        super.onStart();
+        super.onPause();
         client.disconnect();
     }