Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca4199ef authored by Nicolas Klein's avatar Nicolas Klein Committed by Android Git Automerger
Browse files

am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing... 

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

* commit '04f3b12f':
  Fix some typos and missing @param in android.os.Bundle
parents f701090d 04f3b12f

core/java/android/os/Bundle.java

+10 −2
Original line number Diff line number Diff line
@@ -796,6 +796,7 @@ public final class Bundle implements Parcelable, Cloneable { 
     * no mapping of the desired type exists for the given key.

     *

     * @param key a String

     * @param defaultValue Value to return if key does not exist

     * @return a boolean value

     */

    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.

     *

     * @param key a String

     * @param defaultValue Value to return if key does not exist

     * @return a byte value

     */

    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.

     *

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

     *

     * @param key a String

     * @param defaultValue Value to return if key does not exist

     * @return a char value

     */

    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.

     *

     * @param key a String

     * @param defaultValue Value to return if key does not exist

     * @return a short value

     */

    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.

     *

     * @param key a String

     * @param defaultValue Value to return if key does not exist

     * @return an int value

     */

    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.

     *

     * @param key a String

     * @param defaultValue Value to return if key does not exist

     * @return a long value

     */

    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.

     *

     * @param key a String

     * @param defaultValue Value to return if key does not exist

     * @return a float value

     */

    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.

     *

     * @param key a String

     * @param defaultValue Value to return if key does not exist

     * @return a double value

     */

    public double getDouble(String key, double defaultValue) {