Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Shrink Bundle.getString(key, default) and getCharSequence(key, default)"

Browse Source
This commit is contained in:
Christopher Tate
2013-01-03 15:39:58 -08:00
committed by Android (Google) Code Review
parent c48233c60d 116751d84f
commit a82fe9faa1
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/java/android/os/Bundle.java
View File

@@ -1061,10 +1061,7 @@ public final class Bundle implements Parcelable, Cloneable {
*/ */
public String getString(String key) { public String getString(String key) {
unparcel(); unparcel();
Object o = mMap.get(key); final Object o = mMap.get(key);
if (o == null) {
return null;
}
try { try {
return (String) o; return (String) o;
} catch (ClassCastException e) { } catch (ClassCastException e) {
@@ -1079,20 +1076,12 @@ public final class Bundle implements Parcelable, Cloneable {
* *
* @param key a String, or null * @param key a String, or null
* @param defaultValue Value to return if key does not exist * @param defaultValue Value to return if key does not exist
* @return a String value, or null * @return the String value associated with the given key, or defaultValue
* if no valid String object is currently mapped to that key.
*/ */
public String getString(String key, String defaultValue) { public String getString(String key, String defaultValue) {
unparcel(); final String s = getString(key);
Object o = mMap.get(key); return (s == null) ? defaultValue : s;
if (o == null) {
return defaultValue;
}
try {
return (String) o;
} catch (ClassCastException e) {
typeWarning(key, o, "String", e);
return defaultValue;
}
} }
/** /**
@@ -1105,10 +1094,7 @@ public final class Bundle implements Parcelable, Cloneable {
*/ */
public CharSequence getCharSequence(String key) { public CharSequence getCharSequence(String key) {
unparcel(); unparcel();
Object o = mMap.get(key); final Object o = mMap.get(key);
if (o == null) {
return null;
}
try { try {
return (CharSequence) o; return (CharSequence) o;
} catch (ClassCastException e) { } catch (ClassCastException e) {
@@ -1123,20 +1109,12 @@ public final class Bundle implements Parcelable, Cloneable {
* *
* @param key a String, or null * @param key a String, or null
* @param defaultValue Value to return if key does not exist * @param defaultValue Value to return if key does not exist
* @return a CharSequence value, or null * @return the CharSequence value associated with the given key, or defaultValue
* if no valid CharSequence object is currently mapped to that key.
*/ */
public CharSequence getCharSequence(String key, CharSequence defaultValue) { public CharSequence getCharSequence(String key, CharSequence defaultValue) {
unparcel(); final CharSequence cs = getCharSequence(key);
Object o = mMap.get(key); return (cs == null) ? defaultValue : cs;
if (o == null) {
return defaultValue;
}
try {
return (CharSequence) o;
} catch (ClassCastException e) {
typeWarning(key, o, "CharSequence", e);
return defaultValue;
}
} }
/** /**