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

Commit 66ad3931 authored by Jon Dormody's avatar Jon Dormody Committed by android-build-merger
Browse files

Merge "Docs: Changed "the value of an item that previously added with... 

Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev am: 07045715
am: 43a77db0

Change-Id: I0372e97637de2416386ac45dc383b82ddb4a1991
parents 61497d2c 43a77db0

core/java/android/content/Intent.java

+39 −35
Original line number Diff line number Diff line
@@ -7057,7 +7057,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if none was found.

     *

     * @deprecated
@@ -7075,7 +7075,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue the value to be returned if no value of the desired

     * type is stored with the given name.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or the default value if none was found.

     *

     * @see #putExtra(String, boolean)
@@ -7092,7 +7092,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue the value to be returned if no value of the desired

     * type is stored with the given name.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or the default value if none was found.

     *

     * @see #putExtra(String, byte)
@@ -7109,7 +7109,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue the value to be returned if no value of the desired

     * type is stored with the given name.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or the default value if none was found.

     *

     * @see #putExtra(String, short)
@@ -7126,7 +7126,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue the value to be returned if no value of the desired

     * type is stored with the given name.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or the default value if none was found.

     *

     * @see #putExtra(String, char)
@@ -7143,7 +7143,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue the value to be returned if no value of the desired

     * type is stored with the given name.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or the default value if none was found.

     *

     * @see #putExtra(String, int)
@@ -7160,7 +7160,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue the value to be returned if no value of the desired

     * type is stored with the given name.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or the default value if none was found.

     *

     * @see #putExtra(String, long)
@@ -7177,7 +7177,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue the value to be returned if no value of the desired

     * type is stored with the given name.

     *

     * @return the value of an item that previously added with putExtra(),

     * @return the value of an item previously added with putExtra(),

     * or the default value if no such item is present

     *

     * @see #putExtra(String, float)
@@ -7194,7 +7194,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue the value to be returned if no value of the desired

     * type is stored with the given name.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or the default value if none was found.

     *

     * @see #putExtra(String, double)
@@ -7209,7 +7209,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no String value was found.

     *

     * @see #putExtra(String, String)
@@ -7223,7 +7223,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no CharSequence value was found.

     *

     * @see #putExtra(String, CharSequence)
@@ -7237,7 +7237,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no Parcelable value was found.

     *

     * @see #putExtra(String, Parcelable)
@@ -7251,7 +7251,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no Parcelable[] value was found.

     *

     * @see #putExtra(String, Parcelable[])
@@ -7265,8 +7265,9 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * or null if no ArrayList<Parcelable> value was found.

     * @return the value of an item previously added with

     * putParcelableArrayListExtra(), or null if no

     * ArrayList<Parcelable> value was found.

     *

     * @see #putParcelableArrayListExtra(String, ArrayList)

     */
@@ -7279,7 +7280,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no Serializable value was found.

     *

     * @see #putExtra(String, Serializable)
@@ -7293,8 +7294,9 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * or null if no ArrayList<Integer> value was found.

     * @return the value of an item previously added with

     * putIntegerArrayListExtra(), or null if no

     * ArrayList<Integer> value was found.

     *

     * @see #putIntegerArrayListExtra(String, ArrayList)

     */
@@ -7307,8 +7309,9 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * or null if no ArrayList<String> value was found.

     * @return the value of an item previously added with

     * putStringArrayListExtra(), or null if no

     * ArrayList<String> value was found.

     *

     * @see #putStringArrayListExtra(String, ArrayList)

     */
@@ -7321,8 +7324,9 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * or null if no ArrayList<CharSequence> value was found.

     * @return the value of an item previously added with

     * putCharSequenceArrayListExtra, or null if no

     * ArrayList<CharSequence> value was found.

     *

     * @see #putCharSequenceArrayListExtra(String, ArrayList)

     */
@@ -7335,7 +7339,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no boolean array value was found.

     *

     * @see #putExtra(String, boolean[])
@@ -7349,7 +7353,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no byte array value was found.

     *

     * @see #putExtra(String, byte[])
@@ -7363,7 +7367,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no short array value was found.

     *

     * @see #putExtra(String, short[])
@@ -7377,7 +7381,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no char array value was found.

     *

     * @see #putExtra(String, char[])
@@ -7391,7 +7395,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no int array value was found.

     *

     * @see #putExtra(String, int[])
@@ -7405,7 +7409,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no long array value was found.

     *

     * @see #putExtra(String, long[])
@@ -7419,7 +7423,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no float array value was found.

     *

     * @see #putExtra(String, float[])
@@ -7433,7 +7437,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no double array value was found.

     *

     * @see #putExtra(String, double[])
@@ -7447,7 +7451,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no String array value was found.

     *

     * @see #putExtra(String, String[])
@@ -7461,7 +7465,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no CharSequence array value was found.

     *

     * @see #putExtra(String, CharSequence[])
@@ -7475,7 +7479,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no Bundle value was found.

     *

     * @see #putExtra(String, Bundle)
@@ -7489,7 +7493,7 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * @param name The name of the desired item.

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or null if no IBinder value was found.

     *

     * @see #putExtra(String, IBinder)
@@ -7509,7 +7513,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param defaultValue The default value to return in case no item is

     * associated with the key 'name'

     *

     * @return the value of an item that previously added with putExtra()

     * @return the value of an item previously added with putExtra(),

     * or defaultValue if none was found.

     *

     * @see #putExtra