summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2015-03-10 22:08:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-10 22:08:28 +0000
commitc4be90872685c4507b516e96040d57a796792165 (patch)
tree143a7c55f539b9c7241425e754ae190820598757 /docs
parent1d21dc22e2777b68d718f08e0e50767b1e205d67 (diff)
parenta316f3eac3c9bd66098544d4d85aadaa0485f789 (diff)
downloadframeworks_base-c4be90872685c4507b516e96040d57a796792165.zip
frameworks_base-c4be90872685c4507b516e96040d57a796792165.tar.gz
frameworks_base-c4be90872685c4507b516e96040d57a796792165.tar.bz2
Merge "Correct docs to specify leading slash in paths."
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/manifest/data-element.jd5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd
index ecba508..77f16dd 100644
--- a/docs/html/guide/topics/manifest/data-element.jd
+++ b/docs/html/guide/topics/manifest/data-element.jd
@@ -24,7 +24,7 @@ just a URI, or both a data type and a URI. A URI is specified by separate
attributes for each of its parts:
<p style="margin-left: 2em">
-{@code &lt;scheme>://&lt;host>:&lt;port>/[&lt;path>|&lt;pathPrefix>|&lt;pathPattern>]}</p>
+{@code &lt;scheme>://&lt;host>:&lt;port>[&lt;path>|&lt;pathPrefix>|&lt;pathPattern>]}</p>
<p>
These attributes that specify the URL format are optional, but also mutually dependent:
@@ -115,7 +115,8 @@ the filter.</dd>
<dt><a name="path"></a>{@code android:path}
<br/>{@code android:pathPrefix}
<br/>{@code android:pathPattern}</dt>
-<dd>The path part of a URI. The {@code path} attribute specifies a complete
+<dd>The path part of a URI which must begin with a /.
+The {@code path} attribute specifies a complete
path that is matched against the complete path in an Intent object. The
{@code pathPrefix} attribute specifies a partial path that is matched against
only the initial part of the path in the Intent object. The {@code pathPattern}