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

Commit fee6d0cb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Gerrit Code Review
Browse files

Merge "Fix documentation of requestCode parameter."

parents f3251033 f15a419e

core/java/android/app/PendingIntent.java

+6 −12
Original line number Diff line number Diff line
@@ -202,8 +202,7 @@ public final class PendingIntent implements Parcelable { 
     *

     * @param context The Context in which this PendingIntent should start

     * the activity.

     * @param requestCode Private request code for the sender (currently

     * not used).

     * @param requestCode Private request code for the sender

     * @param intent Intent of the activity to be launched.

     * @param flags May be {@link #FLAG_ONE_SHOT}, {@link #FLAG_NO_CREATE},

     * {@link #FLAG_CANCEL_CURRENT}, {@link #FLAG_UPDATE_CURRENT},
@@ -229,8 +228,7 @@ public final class PendingIntent implements Parcelable { 
     *

     * @param context The Context in which this PendingIntent should start

     * the activity.

     * @param requestCode Private request code for the sender (currently

     * not used).

     * @param requestCode Private request code for the sender

     * @param intent Intent of the activity to be launched.

     * @param flags May be {@link #FLAG_ONE_SHOT}, {@link #FLAG_NO_CREATE},

     * {@link #FLAG_CANCEL_CURRENT}, {@link #FLAG_UPDATE_CURRENT},
@@ -315,8 +313,7 @@ public final class PendingIntent implements Parcelable { 
     *

     * @param context The Context in which this PendingIntent should start

     * the activity.

     * @param requestCode Private request code for the sender (currently

     * not used).

     * @param requestCode Private request code for the sender

     * @param intents Array of Intents of the activities to be launched.

     * @param flags May be {@link #FLAG_ONE_SHOT}, {@link #FLAG_NO_CREATE},

     * {@link #FLAG_CANCEL_CURRENT}, {@link #FLAG_UPDATE_CURRENT},
@@ -361,8 +358,7 @@ public final class PendingIntent implements Parcelable { 
     *

     * @param context The Context in which this PendingIntent should start

     * the activity.

     * @param requestCode Private request code for the sender (currently

     * not used).

     * @param requestCode Private request code for the sender

     * @param intents Array of Intents of the activities to be launched.

     * @param flags May be {@link #FLAG_ONE_SHOT}, {@link #FLAG_NO_CREATE},

     * {@link #FLAG_CANCEL_CURRENT}, {@link #FLAG_UPDATE_CURRENT},
@@ -425,8 +421,7 @@ public final class PendingIntent implements Parcelable { 
     *

     * @param context The Context in which this PendingIntent should perform

     * the broadcast.

     * @param requestCode Private request code for the sender (currently

     * not used).

     * @param requestCode Private request code for the sender

     * @param intent The Intent to be broadcast.

     * @param flags May be {@link #FLAG_ONE_SHOT}, {@link #FLAG_NO_CREATE},

     * {@link #FLAG_CANCEL_CURRENT}, {@link #FLAG_UPDATE_CURRENT},
@@ -475,8 +470,7 @@ public final class PendingIntent implements Parcelable { 
     *

     * @param context The Context in which this PendingIntent should start

     * the service.

     * @param requestCode Private request code for the sender (currently

     * not used).

     * @param requestCode Private request code for the sender

     * @param intent An Intent describing the service to be started.

     * @param flags May be {@link #FLAG_ONE_SHOT}, {@link #FLAG_NO_CREATE},

     * {@link #FLAG_CANCEL_CURRENT}, {@link #FLAG_UPDATE_CURRENT},