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

Commit 138a3d3f authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 

* commit 'd5d6f04f':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
parents bc7d5a55 d5d6f04f

core/java/android/app/PendingIntent.java

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ public final class PendingIntent implements Parcelable { 


    /**

     * Like {@link #getActivity(Context, int, Intent, int)}, but allows an

     * array of Intents to be supplied.  The first Intent in the array is

     * array of Intents to be supplied.  The last Intent in the array is

     * taken as the primary key for the PendingIntent, like the single Intent

     * given to {@link #getActivity(Context, int, Intent, int)}.  Upon sending

     * the resulting PendingIntent, all of the Intents are started in the same
@@ -335,7 +335,7 @@ public final class PendingIntent implements Parcelable { 


    /**

     * Like {@link #getActivity(Context, int, Intent, int)}, but allows an

     * array of Intents to be supplied.  The first Intent in the array is

     * array of Intents to be supplied.  The last Intent in the array is

     * taken as the primary key for the PendingIntent, like the single Intent

     * given to {@link #getActivity(Context, int, Intent, int)}.  Upon sending

     * the resulting PendingIntent, all of the Intents are started in the same