summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-06-25 19:06:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-25 19:06:53 +0000
commitba12e226981216116de772739165ace65fe59d5b (patch)
tree663a185d12f1d5117267d0827861ee0fd4e0900d /docs/html
parenta50fa71044f759013dc506ae3dc5fce11e67494e (diff)
parent0b5d0509ad381fc7ab519a60e2d749f27db7a070 (diff)
downloadframeworks_base-ba12e226981216116de772739165ace65fe59d5b.zip
frameworks_base-ba12e226981216116de772739165ace65fe59d5b.tar.gz
frameworks_base-ba12e226981216116de772739165ace65fe59d5b.tar.bz2
am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs
* commit '0b5d0509ad381fc7ab519a60e2d749f27db7a070': docs: Removed sentence from permissions doc
Diffstat (limited to 'docs/html')
-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