diff options
| author | Dmitry Dolinsky <dmitryd@google.com> | 2011-09-13 16:01:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-13 16:01:40 -0700 |
| commit | 03c2a00507b35e7cb5c5f5efa81c94b663cf68dd (patch) | |
| tree | d8fb24b20758296f5151ae3acc18bce26eecb5c3 | |
| parent | c6ceb6a084452c4e815f6bd3a6ea096857e68982 (diff) | |
| parent | ba79f69f017d1922aad7eed44ab086b1a1e5c8e9 (diff) | |
| download | frameworks_base-03c2a00507b35e7cb5c5f5efa81c94b663cf68dd.zip frameworks_base-03c2a00507b35e7cb5c5f5efa81c94b663cf68dd.tar.gz frameworks_base-03c2a00507b35e7cb5c5f5efa81c94b663cf68dd.tar.bz2 | |
Merge "List path-permission element under provider"
| -rw-r--r-- | docs/html/guide/topics/manifest/provider-element.jd | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd index dd00224..4558800 100644 --- a/docs/html/guide/topics/manifest/provider-element.jd +++ b/docs/html/guide/topics/manifest/provider-element.jd @@ -27,7 +27,8 @@ parent.link=manifest-intro.html <dt>can contain:</dt> <dd><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code></dd> +<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code> +<br/><code><a href="{@docRoot}guide/topics/manifest/path-permission-element.html"><path-permission></a></code></dd> <dt>description:</dt> <dd>Declares a content provider — a subclass of @@ -252,7 +253,7 @@ See also the <code><a href="#prmsn">permission</a></code> and <dt><a name="sync"></a>{@code android:syncable}</dt> <dd>Whether or not the data under the content provider's control is to be synchronized with data on a server — "{@code true}" -if it is to be synchronized, and "{@ code false}" if not.</dd> +if it is to be synchronized, and "{@code false}" if not.</dd> <dt><a name="wprmsn"></a>{@code android:writePermission}</dt> <dd>A permission that clients must have to make changes to the data |