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

Commit 43a77db0 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

Change-Id: Ib9702cb1707ba756ea3202e0fdde579f5c493866
parents afb592c4 07045715

core/java/android/content/Intent.java

+39 −35
Original line number Diff line number Diff line
@@ -6981,7 +6981,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
@@ -6999,7 +6999,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)
@@ -7016,7 +7016,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)
@@ -7033,7 +7033,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)
@@ -7050,7 +7050,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)
@@ -7067,7 +7067,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)
@@ -7084,7 +7084,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)
@@ -7101,7 +7101,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)
@@ -7118,7 +7118,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)
@@ -7133,7 +7133,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)
@@ -7147,7 +7147,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)
@@ -7161,7 +7161,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)
@@ -7175,7 +7175,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[])
@@ -7189,8 +7189,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)

     */
@@ -7203,7 +7204,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)
@@ -7217,8 +7218,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)

     */
@@ -7231,8 +7233,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)

     */
@@ -7245,8 +7248,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)

     */
@@ -7259,7 +7263,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[])
@@ -7273,7 +7277,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[])
@@ -7287,7 +7291,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[])
@@ -7301,7 +7305,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[])
@@ -7315,7 +7319,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[])
@@ -7329,7 +7333,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[])
@@ -7343,7 +7347,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[])
@@ -7357,7 +7361,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[])
@@ -7371,7 +7375,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[])
@@ -7385,7 +7389,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[])
@@ -7399,7 +7403,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)
@@ -7413,7 +7417,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)
@@ -7433,7 +7437,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