drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev

Browse Source 
* commit '5ea914f21b397ae57195decd0b5e37544d85db8c':
  Fix some typos and missing @param in android.os.Bundle
This commit is contained in:
Nicolas Klein
2012-11-30 15:41:10 -08:00
committed by Android Git Automerger
parent deab6fd2e8 5ea914f21b
commit 04f3b12f1f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,6 +796,7 @@ public final class Bundle implements Parcelable, Cloneable {
* no mapping of the desired type exists for the given key. * no mapping of the desired type exists for the given key.
* *
* @param key a String * @param key a String
* @param defaultValue Value to return if key does not exist
* @return a boolean value * @return a boolean value
*/ */
public boolean getBoolean(String key, boolean defaultValue) { public boolean getBoolean(String key, boolean defaultValue) {
@ -829,6 +830,7 @@ public final class Bundle implements Parcelable, Cloneable {
* no mapping of the desired type exists for the given key. * no mapping of the desired type exists for the given key.
* *
* @param key a String * @param key a String
* @param defaultValue Value to return if key does not exist
* @return a byte value * @return a byte value
*/ */
public Byte getByte(String key, byte defaultValue) { public Byte getByte(String key, byte defaultValue) {
@ -846,7 +848,7 @@ public final class Bundle implements Parcelable, Cloneable {
} }
/** /**
* Returns the value associated with the given key, or false if * Returns the value associated with the given key, or (char) 0 if
* no mapping of the desired type exists for the given key. * no mapping of the desired type exists for the given key.
* *
* @param key a String * @param key a String
@ -858,10 +860,11 @@ public final class Bundle implements Parcelable, Cloneable {
} }
/** /**
* Returns the value associated with the given key, or (char) 0 if * 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.
* *
* @param key a String * @param key a String
* @param defaultValue Value to return if key does not exist
* @return a char value * @return a char value
*/ */
public char getChar(String key, char defaultValue) { public char getChar(String key, char defaultValue) {
@ -895,6 +898,7 @@ public final class Bundle implements Parcelable, Cloneable {
* no mapping of the desired type exists for the given key. * no mapping of the desired type exists for the given key.
* *
* @param key a String * @param key a String
* @param defaultValue Value to return if key does not exist
* @return a short value * @return a short value
*/ */
public short getShort(String key, short defaultValue) { public short getShort(String key, short defaultValue) {
@ -928,6 +932,7 @@ public final class Bundle implements Parcelable, Cloneable {
* no mapping of the desired type exists for the given key. * no mapping of the desired type exists for the given key.
* *
* @param key a String * @param key a String
* @param defaultValue Value to return if key does not exist
* @return an int value * @return an int value
*/ */
public int getInt(String key, int defaultValue) { public int getInt(String key, int defaultValue) {
@ -961,6 +966,7 @@ public final class Bundle implements Parcelable, Cloneable {
* no mapping of the desired type exists for the given key. * no mapping of the desired type exists for the given key.
* *
* @param key a String * @param key a String
* @param defaultValue Value to return if key does not exist
* @return a long value * @return a long value
*/ */
public long getLong(String key, long defaultValue) { public long getLong(String key, long defaultValue) {
@ -994,6 +1000,7 @@ public final class Bundle implements Parcelable, Cloneable {
* no mapping of the desired type exists for the given key. * no mapping of the desired type exists for the given key.
* *
* @param key a String * @param key a String
* @param defaultValue Value to return if key does not exist
* @return a float value * @return a float value
*/ */
public float getFloat(String key, float defaultValue) { public float getFloat(String key, float defaultValue) {
@ -1027,6 +1034,7 @@ public final class Bundle implements Parcelable, Cloneable {
* no mapping of the desired type exists for the given key. * no mapping of the desired type exists for the given key.
* *
* @param key a String * @param key a String
* @param defaultValue Value to return if key does not exist
* @return a double value * @return a double value
*/ */
public double getDouble(String key, double defaultValue) { public double getDouble(String key, double defaultValue) {