Setting class loader before unmarshalling bundle to prevent java.lang.ClassNotFoundException.

1 files changed, 1 insertions, 0 deletions

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 d1eb1b4..a1d3425 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
@@ -146,6 +146,7 @@ public class JsonBuilder {
 
     private static JSONObject buildJsonBundle(Bundle bundle) throws JSONException {
         JSONObject result = new JSONObject();
+        bundle.setClassLoader(JsonBuilder.class.getClassLoader());
         for (String key : bundle.keySet()) {
             result.put(key, build(bundle.get(key)));
         }