Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9b59509c: am 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."

Browse Source 
* commit '9b59509c6a94f1943ce64d3b5e9b4de2aa846d4d':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
This commit is contained in:
Dianne Hackborn
2013-01-07 12:23:59 -08:00
committed by Android Git Automerger
parent 7d1c4fa322 9b59509c6a
commit dff561f42b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/PendingIntent.java
View File

@@ -289,7 +289,7 @@ public final class PendingIntent implements Parcelable {
/** /**
* Like {@link #getActivity(Context, int, Intent, int)}, but allows an * 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 * taken as the primary key for the PendingIntent, like the single Intent
* given to {@link #getActivity(Context, int, Intent, int)}. Upon sending * given to {@link #getActivity(Context, int, Intent, int)}. Upon sending
* the resulting PendingIntent, all of the Intents are started in the same * 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 * 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 * taken as the primary key for the PendingIntent, like the single Intent
* given to {@link #getActivity(Context, int, Intent, int)}. Upon sending * given to {@link #getActivity(Context, int, Intent, int)}. Upon sending
* the resulting PendingIntent, all of the Intents are started in the same * the resulting PendingIntent, all of the Intents are started in the same