Backed out changeset 46b4833e84c3 (bug 776027)

2014-04-15 12:16:16 +02:00
parent 1e3ea27ae8
commit 2ca6a05dee
4 changed files with 5 additions and 167 deletions
--- a/mobile/android/base/util/JSONUtils.java
+++ b/mobile/android/base/util/JSONUtils.java
@@ -57,11 +57,11 @@ public final class JSONUtils {
    }

    public static JSONObject bundleToJSON(Bundle bundle) {
-        if (bundle == null || bundle.isEmpty()) {
-            return null;
+        JSONObject json = new JSONObject();
+        if (bundle == null) {
+            return json;
        }

-        JSONObject json = new JSONObject();
        for (String key : bundle.keySet()) {
            try {
                json.put(key, bundle.get(key));