diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-01-15 04:57:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 04:57:52 +0000 |
| commit | e6eb0772d680e8dbb7477a7f972d862a7720d25e (patch) | |
| tree | 0eb2d7365290720f5e4fd78d0c016c69f8bfe478 /core/java/android/content | |
| parent | f78ff7d49a4da604ba4fbcf2b662f5e4bd8bfa16 (diff) | |
| parent | fce232b4080a12220821568ab670a0cdce4893c5 (diff) | |
| download | frameworks_base-e6eb0772d680e8dbb7477a7f972d862a7720d25e.zip frameworks_base-e6eb0772d680e8dbb7477a7f972d862a7720d25e.tar.gz frameworks_base-e6eb0772d680e8dbb7477a7f972d862a7720d25e.tar.bz2 | |
am fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev
* commit 'fce232b4080a12220821568ab670a0cdce4893c5':
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> * |