diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 11f8c7bd72d91..0b3373952feb3 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -139,6 +139,7 @@
  • <intent-filter>
  • <manifest>
  • <meta-data>
    • +
  • <path-permission>
  • <permission>
  • <permission-group>
  • <permission-tree>
    • diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd index 9e1b18ddfa33e..89171c1d42f1d 100644 --- a/docs/html/guide/topics/manifest/manifest-intro.jd +++ b/docs/html/guide/topics/manifest/manifest-intro.jd @@ -112,6 +112,7 @@ other mention of the element name. <provider> <grant-uri-permission /> + <path-permission /> <meta-data /> </provider> @@ -140,6 +141,7 @@ add your own elements or attributes.
    <intent-filter>
    <manifest>
    <meta-data> +
    <path-permission />
    <permission>
    <permission-group>
    <permission-tree> diff --git a/docs/html/guide/topics/manifest/path-permission-element.jd b/docs/html/guide/topics/manifest/path-permission-element.jd new file mode 100644 index 0000000000000..5c271a73b86fc --- /dev/null +++ b/docs/html/guide/topics/manifest/path-permission-element.jd @@ -0,0 +1,104 @@ +page.title=<path-permission> +@jd:body + +
    +
    syntax:
    +
    +<path-permission android:path="string"
+                 android:pathPrefix="string"
+                 android:pathPattern="string"
+                 android:permission="string"
+                 android:readPermission="string"
+                 android:writePermission="string" />
+
    + +
    contained in:
    +
    <provider>
    + + + +
    description:
    +
    Defines the path and required permissions for a specific subset of data +within a content provider. This element can be +specified multiple times to supply multiple paths. + +
    + +
    attributes:
    + +
    +
    {@code android:path}
    +
    A complete URI path for a subset of content provider data. +Permission can be granted only to the particular data identified by this path. +When used to provide search suggestion content, it must be appended +with "/search_suggest_query". +
    + +
    {@code android:pathPrefix}
    +
    The initial part of a URI path for a subset of content provider data. +Permission can be granted to all data subsets with paths that share this initial part. +
    + +
    {@code android:pathPattern}
    +
    A complete URI path for a subset of content provider data, +but one that can use the following wildcards: + +
      +
    • An asterisk ('*'). This matches a sequence of 0 to many occurrences of +the immediately preceding character.
      • + +
    • A period followed by an asterisk (".*"). This matches any sequence of +0 or more characters.
      • +
    + +

    +Because '\' is used as an escape character when the string is read +from XML (before it is parsed as a pattern), you will need to double-escape. +For example, a literal '*' would be written as "\\*" and a +literal '\' would be written as "\\". This is basically +the same as what you would need to write if constructing the string in Java code. +

    +

    +For more information on these types of patterns, see the descriptions of +PATTERN_LITERAL, +PATTERN_PREFIX, and +PATTERN_SIMPLE_GLOB in the +PatternMatcher class. +

    +
    + +
    {@code android:permission}
    +
    The name of a permission that clients must have in order to read or write the +content provider's data. This attribute is a convenient way of setting a +single permission for both reading and writing. However, the +readPermission and +writePermission attributes take precedence +over this one. +
    + +
    {@code android:readPermission}
    +
    A permission that clients must have in order to query the content provider. +
    + +
    {@code android:writePermission}
    +
    A permission that clients must have in order to make changes to the data controlled by the content provider. +
    + + + +
    + + +
    introduced in:
    +
    API Level 4
    + +
    see also:
    +
    {@link android.app.SearchManager}
    +
    {@link android.Manifest.permission}
    +
    Security and +Permissions
    + +
    diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd index 2bb4ff40f03b2..3942f95084be3 100644 --- a/docs/html/guide/topics/manifest/provider-element.jd +++ b/docs/html/guide/topics/manifest/provider-element.jd @@ -25,7 +25,9 @@ page.title=<provider>
    can contain:
    <meta-data> -
    <grant-uri-permission>
    +
    <grant-uri-permission> +
    <path-permission /> +
    description:
    Declares a content provider — a subclass of