Merge "Update javadoc for android.os.Bundle." (989ab6d3) · Commits · e / os / android_frameworks_base

core/java/android/os/Bundle.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -1127,10 +1127,12 @@ public final class Bundle implements Parcelable, Cloneable {

		/**
		* Returns the value associated with the given key, or defaultValue if
		* no mapping of the desired type exists for the given key.
		* no mapping of the desired type exists for the given key or if a null
		* value is explicitly associated with the given key.
		*
		* @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 or if a null
		* value is associated with the given key.
		* @return the String value associated with the given key, or defaultValue
		* if no valid String object is currently mapped to that key.
		*/
		@@ -1160,10 +1162,12 @@ public final class Bundle implements Parcelable, Cloneable {

		/**
		* Returns the value associated with the given key, or defaultValue if
		* no mapping of the desired type exists for the given key.
		* no mapping of the desired type exists for the given key or if a null
		* value is explicitly associatd with the given key.
		*
		* @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 or if a null
		* value is associated with the given key.
		* @return the CharSequence value associated with the given key, or defaultValue
		* if no valid CharSequence object is currently mapped to that key.
		*/