diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-01-15 01:52:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 01:52:21 +0000 |
| commit | fce232b4080a12220821568ab670a0cdce4893c5 (patch) | |
| tree | 73070786f0446fbc324407037245d94f97ccb2c4 /core/java/android/content | |
| parent | cefeb34e4866209e2ccf4c520919fe31a3f1aeb5 (diff) | |
| parent | 5a4b4084215b1efc5308c0c914185599b4d502bf (diff) | |
| download | frameworks_base-fce232b4080a12220821568ab670a0cdce4893c5.zip frameworks_base-fce232b4080a12220821568ab670a0cdce4893c5.tar.gz frameworks_base-fce232b4080a12220821568ab670a0cdce4893c5.tar.bz2 | |
am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev
* commit '5a4b4084215b1efc5308c0c914185599b4d502bf':
Fix issue android-app doc, bump battery stats checkin version
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/Intent.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 5ebbf16..af7ec5e 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3949,10 +3949,12 @@ public class Intent implements Parcelable, Cloneable { * is: * * <pre class="prettyprint"> - * android-app://{package_id}/{scheme}/{host}/{path}{#Intent;...}</pre> + * android-app://{package_id}[/{scheme}[/{host}[/{path}]]][#Intent;{...}]</pre> * - * <p>In this scheme, only the <code>pacakge_id</code> is required, and all - * other components can be included as desired. Note that this can not be + * <p>In this scheme, only the <code>package_id</code> is required. If you include a host, + * you must also include a scheme; including a path also requires both a host and a scheme. + * The final #Intent; fragment can be used without a scheme, host, or path. + * Note that this can not be * used with intents that have a {@link #setSelector}, since the base intent * will always have an explicit package name.</p> * |