diff options
| author | 2014-06-24 10:18:23 +0000 | |
|---|---|---|
| committer | 2014-06-24 10:18:23 +0000 | |
| commit | 816cff12e1864c4e3d2a9bdc5f57b4b8cc03ac86 (patch) | |
| tree | 269507518dbd924c7f1e9fd7f482a816239aae41 | |
| parent | ed24d3f2e991906973afce8aa6a3fa54f4a3e4df (diff) | |
| parent | c141ae547e9b295ce9013591a6fbb902b0e40073 (diff) | |
am c141ae54: am 989ab6d3: Merge "Update javadoc for android.os.Bundle."
* commit 'c141ae547e9b295ce9013591a6fbb902b0e40073':
Update javadoc for android.os.Bundle.
| -rw-r--r-- | core/java/android/os/Bundle.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index af57507b8782..fd1df9238a9d 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -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. */ |