summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-06-25 18:57:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-25 18:57:08 +0000
commit0b5d0509ad381fc7ab519a60e2d749f27db7a070 (patch)
tree9fdc6b6a0c6cb6b217fee58d98aed0c9a288b821 /docs
parent3eefa1f9de9e6466251373074f3c720936b62a8c (diff)
parentf496648e2dc2ce99784568e49f1dd782761c43bb (diff)
downloadframeworks_base-0b5d0509ad381fc7ab519a60e2d749f27db7a070.zip
frameworks_base-0b5d0509ad381fc7ab519a60e2d749f27db7a070.tar.gz
frameworks_base-0b5d0509ad381fc7ab519a60e2d749f27db7a070.tar.bz2
Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/security/permissions.jd4
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/html/guide/topics/security/permissions.jd b/docs/html/guide/topics/security/permissions.jd
index 6f919da..cfab3c9 100644
--- a/docs/html/guide/topics/security/permissions.jd
+++ b/docs/html/guide/topics/security/permissions.jd
@@ -52,9 +52,7 @@ must explicitly share resources and data. They do this by declaring the
<em>permissions</em> they need for additional capabilities not provided by
the basic sandbox. Applications statically declare the permissions they
require, and the Android system prompts the user for consent at the time the
-application is installed. Android has no mechanism for granting permissions
-dynamically (at run-time) because it complicates the user experience to the
-detriment of security.</p>
+application is installed.</p>
<p>The application sandbox does not depend on the technology used to build
an application. In particular the Dalvik VM is not a security boundary, and