summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2010-10-15 10:11:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 10:11:50 -0700
commit6bc34da8acf26c8e70325719fe43eaf22489809d (patch)
tree128e452ffb198f2852fe64423fdd53ed11b3b5e4
parent86052a87409e7ceac654ffebbb9bcfce1597c5d8 (diff)
parent612ebb9257e2adf982ed846fa43251c3754361f7 (diff)
downloadframeworks_base-6bc34da8acf26c8e70325719fe43eaf22489809d.zip
frameworks_base-6bc34da8acf26c8e70325719fe43eaf22489809d.tar.gz
frameworks_base-6bc34da8acf26c8e70325719fe43eaf22489809d.tar.bz2
am 612ebb92: Revert "Update the documentation for content provider security."
Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp * commit '612ebb9257e2adf982ed846fa43251c3754361f7': Revert "Update the documentation for content provider security."
-rw-r--r--docs/html/guide/topics/manifest/provider-element.jd17
1 files changed, 4 insertions, 13 deletions
diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd
index bee87e6..c80b207 100644
--- a/docs/html/guide/topics/manifest/provider-element.jd
+++ b/docs/html/guide/topics/manifest/provider-element.jd
@@ -96,19 +96,10 @@ If "{@code false}", the provider is available only to components of the
same application or applications with the same user ID. The default value
is "{@code true}".
-<p>You can export a content provider but still limit access to it with the
-<code><a
-href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">permission</a></code>
-attribute. Note that due to a bug in versions of Android prior to {@link
-android.os.Build.VERSION_CODES#VERSION_GINGERBREAD} providers were exported
-even if {@code android:exported} were set to {@code false}. Therefore, for
-provider security on all devices, protect your provider with a
-signature-level permission. For information on defining a permission, see
-the <a
-href="{@docRoot}guide/topics/manifest/permission-element.html">permission
-element</a>. For information on using the permission, see the <a
-href="{@docRoot}guide/topics/manifest/uses-permission-element.html">uses-permission
-element</a>.</p></dd>
+<p>
+You can export a content provider but still limit access to it with the
+<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#prmsn">permission</a></code> attribute.
+</p></dd>
<dt><a name="gprmsn"></a>{@code android:grantUriPermissions}</dt>
<dd>Whether or not those who ordinarily would not have permission to