summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-07-13 23:58:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 23:58:03 +0000
commit0b403ebd6aecdf6691c4df009c791096d734aeb0 (patch)
tree005e47bae02092fde4676c06af4acc61668a203d /docs/html/guide
parent91a44578e4f1788cb97da79863faaa4ba7970f45 (diff)
parent1962b730067d5b9ad9666ee3a7d1e3f90004c7d7 (diff)
downloadframeworks_base-0b403ebd6aecdf6691c4df009c791096d734aeb0.zip
frameworks_base-0b403ebd6aecdf6691c4df009c791096d734aeb0.tar.gz
frameworks_base-0b403ebd6aecdf6691c4df009c791096d734aeb0.tar.bz2
am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '1962b730067d5b9ad9666ee3a7d1e3f90004c7d7': docs: Removed parenthetic phrase that made explanation unnecessarily confusing
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/components/bound-services.jd3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/html/guide/components/bound-services.jd b/docs/html/guide/components/bound-services.jd
index 4215f0f..c2ac607 100644
--- a/docs/html/guide/components/bound-services.jd
+++ b/docs/html/guide/components/bound-services.jd
@@ -649,8 +649,7 @@ clients.</p>
<p>Additionally, if your service is started and accepts binding, then when the system calls
your {@link android.app.Service#onUnbind onUnbind()} method, you can optionally return
{@code true} if you would like to receive a call to {@link android.app.Service#onRebind
-onRebind()} the next time a client binds to the service (instead of receiving a call to {@link
-android.app.Service#onBind onBind()}). {@link android.app.Service#onRebind
+onRebind()} the next time a client binds to the service. {@link android.app.Service#onRebind
onRebind()} returns void, but the client still receives the {@link android.os.IBinder} in its
{@link android.content.ServiceConnection#onServiceConnected onServiceConnected()} callback.
Below, figure 1 illustrates the logic for this kind of lifecycle.</p>