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

am ae22c05b: Try to fix docs build.

Browse Source 
Merge commit 'ae22c05b91d1e7a458066792eb5cfc0974c1be9e' into eclair-plus-aosp

* commit 'ae22c05b91d1e7a458066792eb5cfc0974c1be9e':
  Try to fix docs build.
This commit is contained in:
Dianne Hackborn
2009-09-17 18:52:12 -07:00
committed by Android Git Automerger
parent 1f3914b7f2 ae22c05b91
commit 4ecb536d3e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2861,7 +2861,7 @@ public class Activity extends ContextThemeWrapper
/** /**
* Like {@link #startActivity(Intent)}, but taking a IntentSender * Like {@link #startActivity(Intent)}, but taking a IntentSender
* to start; see * to start; see
* {@link #startIntentSenderForResult(IntentSender, int, Intent, int, int)} * {@link #startIntentSenderForResult(IntentSender, int, Intent, int, int, int)}
* for more information. * for more information.
* *
* @param intent The IntentSender to launch. * @param intent The IntentSender to launch.
@@ -3003,7 +3003,7 @@ public class Activity extends ContextThemeWrapper
/** /**
* Like {@link #startActivityFromChild(Activity, Intent, int)}, but * Like {@link #startActivityFromChild(Activity, Intent, int)}, but
* taking a IntentSender; see * taking a IntentSender; see
* {@link #startIntentSenderForResult(IntentSender, int, Intent, int, int)} * {@link #startIntentSenderForResult(IntentSender, int, Intent, int, int, int)}
* for more information. * for more information.
*/ */
public void startIntentSenderFromChild(Activity child, IntentSender intent, public void startIntentSenderFromChild(Activity child, IntentSender intent,

2
core/java/android/content/Context.java
View File

@@ -561,7 +561,7 @@ public abstract class Context {
/** /**
* Like {@link #startActivity(Intent)}, but taking a IntentSender * Like {@link #startActivity(Intent)}, but taking a IntentSender
* to start. If the IntentSender is for an activity, that activity will be started * to start. If the IntentSender is for an activity, that activity will be started
* as if you had called the regular {@link #startActivityForResult(Intent, int)} * as if you had called the regular {@link #startActivity(Intent)}
* here; otherwise, its associated action will be executed (such as * here; otherwise, its associated action will be executed (such as
* sending a broadcast) as if you had called * sending a broadcast) as if you had called
* {@link IntentSender#sendIntent IntentSender.sendIntent} on it. * {@link IntentSender#sendIntent IntentSender.sendIntent} on it.