Merge "docs: fix a couple api links" into gingerbread

This commit is contained in:
Scott Main
2010-10-25 11:18:28 -07:00
committed by Android (Google) Code Review

View File

@@ -80,7 +80,8 @@ public abstract class Context {
/** /**
* Flag for {@link #bindService}: automatically create the service as long * Flag for {@link #bindService}: automatically create the service as long
* as the binding exists. Note that while this will create the service, * as the binding exists. Note that while this will create the service,
* its {@link android.app.Service#onStart} method will still only be called due to an * its {@link android.app.Service#onStartCommand}
* method will still only be called due to an
* explicit call to {@link #startService}. Even without that, though, * explicit call to {@link #startService}. Even without that, though,
* this still provides you with access to the service object while the * this still provides you with access to the service object while the
* service is created. * service is created.
@@ -1011,7 +1012,7 @@ public abstract class Context {
* process for it if needed); if it is running then it remains running. * process for it if needed); if it is running then it remains running.
* *
* <p>Every call to this method will result in a corresponding call to * <p>Every call to this method will result in a corresponding call to
* the target service's {@link android.app.Service#onStart} method, * the target service's {@link android.app.Service#onStartCommand} method,
* with the <var>intent</var> given here. This provides a convenient way * with the <var>intent</var> given here. This provides a convenient way
* to submit jobs to a service without having to bind and call on to its * to submit jobs to a service without having to bind and call on to its
* interface. * interface.
@@ -1108,8 +1109,9 @@ public abstract class Context {
* description (action, category, etc) to match an * description (action, category, etc) to match an
* {@link IntentFilter} published by a service. * {@link IntentFilter} published by a service.
* @param conn Receives information as the service is started and stopped. * @param conn Receives information as the service is started and stopped.
* @param flags Operation options for the binding. May be 0 or * @param flags Operation options for the binding. May be 0,
* {@link #BIND_AUTO_CREATE}. * {@link #BIND_AUTO_CREATE}, {@link #BIND_DEBUG_UNBIND}, or
* {@link #BIND_NOT_FOREGROUND}.
* @return If you have successfully bound to the service, true is returned; * @return If you have successfully bound to the service, true is returned;
* false is returned if the connection is not made so you will not * false is returned if the connection is not made so you will not
* receive the service object. * receive the service object.
@@ -1119,6 +1121,8 @@ public abstract class Context {
* @see #unbindService * @see #unbindService
* @see #startService * @see #startService
* @see #BIND_AUTO_CREATE * @see #BIND_AUTO_CREATE
* @see #BIND_DEBUG_UNBIND
* @see #BIND_NOT_FOREGROUND
*/ */
public abstract boolean bindService(Intent service, ServiceConnection conn, public abstract boolean bindService(Intent service, ServiceConnection conn,
int flags); int flags);