diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-01-14 16:16:13 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-01-14 16:16:13 -0800 |
| commit | 0ee10f6d263e5476d0eb8f8ba82ff5cd522883e9 (patch) | |
| tree | eec1ac2c5e0f301458c1d793cd2f88c237ce9c9d /core/java/android/content | |
| parent | a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b (diff) | |
| download | frameworks_base-0ee10f6d263e5476d0eb8f8ba82ff5cd522883e9.zip frameworks_base-0ee10f6d263e5476d0eb8f8ba82ff5cd522883e9.tar.gz frameworks_base-0ee10f6d263e5476d0eb8f8ba82ff5cd522883e9.tar.bz2 | |
Fix issue android-app doc, bump battery stats checkin version
Issue #18983662: API Reivew: clarify Intent docs for URI_ANDROID_APP_SCHEME
Issue #19019830: Bump up battery stats checkin version
Change-Id: I0bd8f32b9d8d5978bd01d421ea2232d20def340a
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> * |