Fix Bundle#getBundle(String key, String defaultValue) for value = null.

Change-Id: If645b30e982c3dc96b50903baeedeab57779b3ce

2 files changed, 3 insertions, 6 deletions

diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java
index cc458bc5e..7b11ab3a3 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowBundle.java
@@ -56,11 +56,8 @@ public class ShadowBundle {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB_MR1) {
             throw new RuntimeException(new NoSuchMethodException("Requires API_12"));
         }
-        if (map.containsKey(key)) {
-            Object value = map.get(key);
-            return value == null || !(value instanceof String) ? null : (String) value;
-        }
-        return defaultValue;
+        Object value = map.get(key);
+        return value == null || !(value instanceof String) ? defaultValue : (String) value;
     }
 
     @Implementation
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/BundleTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/BundleTest.java
index c67b2f683..e5fe550b5 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/BundleTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/BundleTest.java
@@ -174,7 +174,7 @@ public class BundleTest {
 
         try {
             bundle.putString("key", null);
-            assertNull(bundle.getString("key", "defaultValue"));
+            assertEquals("defaultValue", bundle.getString("key", "defaultValue"));
         } finally {
             Robolectric.Reflection.setFinalStaticField(Build.VERSION.class, "SDK_INT",
                     previousApiLevel);