Minor clean ups (#87) (#91)

* Remove accidental duplication of example1 source.
* Fix apk paths in README.

5 files changed, 9 insertions, 10 deletions

diff --git a/examples/ex1_standalone_app/src/main/java/com/google/android/mobly/snippet/example1/ExampleSnippet2.java b/examples/ex1_standalone_app/src/main/java/com/google/android/mobly/snippet/example1/ExampleSnippet2.java
index b48d475..61c3e0a 100644
--- a/examples/ex1_standalone_app/src/main/java/com/google/android/mobly/snippet/example1/ExampleSnippet2.java
+++ b/examples/ex1_standalone_app/src/main/java/com/google/android/mobly/snippet/example1/ExampleSnippet2.java
@@ -20,6 +20,9 @@ import com.google.android.mobly.snippet.Snippet;
 import com.google.android.mobly.snippet.rpc.Rpc;
 
 import com.google.android.mobly.snippet.rpc.RunOnUiThread;
+
+import org.json.JSONArray;
+
 import java.io.IOException;
 
 public class ExampleSnippet2 implements Snippet {
@@ -28,6 +31,11 @@ public class ExampleSnippet2 implements Snippet {
         return "bar " + input;
     }
 
+    @Rpc(description = "Returns the given JSON array with the prefix \"bar\"")
+    public String getJSONArray(JSONArray input) {
+        return "bar " + input;
+    }
+
     @Rpc(description = "Throws an exception")
     public String throwSomething() throws IOException {
         throw new IOException("Example exception from throwSomething()");
diff --git a/examples/ex5_schedule_rpc/README.md b/examples/ex5_schedule_rpc/README.md
index 919f155..4ccd10f 100644
--- a/examples/ex5_schedule_rpc/README.md
+++ b/examples/ex5_schedule_rpc/README.md
@@ -45,7 +45,7 @@ This folder contains a fully working example of a standalone snippet apk.
 
 1.  Use `snippet_shell` from mobly to trigger `tryEvent()`:
 
-        snippet_shell.py com.google.android.mobly.snippet.example4
+        snippet_shell.py com.google.android.mobly.snippet.example5
 
         >>> callback = s.scheduleRpc('makeToast', 5000, ['message'])
 
diff --git a/examples/ex6_complex_type_conversion/src/main/java/com/google/android/mobly/snippet/example6/ExampleObjectConverter.java b/examples/ex6_complex_type_conversion/src/main/java/com/google/android/mobly/snippet/example6/ExampleObjectConverter.java
index 5fc4f22..eea8831 100644
--- a/examples/ex6_complex_type_conversion/src/main/java/com/google/android/mobly/snippet/example6/ExampleObjectConverter.java
+++ b/examples/ex6_complex_type_conversion/src/main/java/com/google/android/mobly/snippet/example6/ExampleObjectConverter.java
@@ -1,7 +1,5 @@
 package com.google.android.mobly.snippet.example6;
 
-import android.os.Bundle;
-
 import com.google.android.mobly.snippet.SnippetObjectConverter;
 
 import org.json.JSONException;
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java
index 7580441..7772d4d 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java
@@ -60,8 +60,6 @@ public class SnippetManager {
     private final Map<Class<? extends Snippet>, Snippet> mSnippets;
     /** A map of strings to known RPCs. */
     private final Map<String, MethodDescriptor> mKnownRpcs;
-    /** The converter used to serialize and deserialize objects. */
-    private SnippetObjectConverter mObjectConverter;
 
     private static SnippetManager sInstance = null;
     private boolean mShutdown = false;
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonBuilder.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonBuilder.java
index 5b0065a..d1eb1b4 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonBuilder.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonBuilder.java
@@ -18,7 +18,6 @@ package com.google.android.mobly.snippet.rpc;
 
 import android.content.ComponentName;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.ParcelUuid;
 import com.google.android.mobly.snippet.manager.SnippetObjectConverterManager;
@@ -198,8 +197,4 @@ public class JsonBuilder {
         url.put("Protocol", data.getProtocol());
         return url;
     }
-
-    private static JSONObject buildUri(Uri uri) throws JSONException {
-        return new JSONObject().put("Uri", build((uri != null) ? uri.toString() : ""));
-    }
 }