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

Commit 51a0e745 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1 

* commit '13299a33':
  Fix some java docs.
parents 25adf474 13299a33

core/java/android/content/Intent.java

+9 −9
Original line number Diff line number Diff line
@@ -2318,7 +2318,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)
@@ -2330,7 +2330,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)
@@ -2342,7 +2342,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)
@@ -2354,7 +2354,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)
@@ -2366,7 +2366,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)
@@ -2379,7 +2379,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)
@@ -2391,7 +2391,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)
@@ -2403,7 +2403,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)
@@ -2416,7 +2416,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>NOTE: This should not be used as the primary key of an Intent,

     * since it will not result in the app launching with the correct

     * action and category.  Instead, use this with

     * {@link #makeMainSelectorActivity(String, String) to generate a main

     * {@link #makeMainSelectorActivity(String, String)} to generate a main

     * Intent with this category in the selector.</p>

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)