aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxianyuanjia <56282287+xianyuanjia@users.noreply.github.com>2021-12-09 14:37:14 -0800
committerGitHub <noreply@github.com>2021-12-09 14:37:14 -0800
commit52cfcf2fb5af0d7f7f650bea0fb298371687e019 (patch)
tree8688e29b744d0986c1cc07a3434f36f987fe75e5
parenta333857db23a5d7f003fa38635b866eff311e2ae (diff)
parentac80957f666a2656ace343769d743bf97b92fae8 (diff)
downloadmobly-snippet-lib-52cfcf2fb5af0d7f7f650bea0fb298371687e019.tar.gz
Merge pull request #114 from BediakoCynoc/new_feature
Setting class loader before unmarshalling bundle to prevent java.lang…
-rw-r--r--third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonBuilder.java1
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)));
}