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

am c141ae54: am 989ab6d3: Merge "Update javadoc for android.os.Bundle."

Browse Source 
* commit 'c141ae547e9b295ce9013591a6fbb902b0e40073':
  Update javadoc for android.os.Bundle.
This commit is contained in:
Narayan Kamath
2014-06-24 10:18:23 +00:00
committed by Android Git Automerger
parent ed24d3f2e9 c141ae547e
commit 816cff12e1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.
*/