summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-06-03 13:04:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-03 13:04:01 -0700
commit7c0761052e0e1ae0ab89fc30247a0f88b8b52124 (patch)
tree4beb97cb9bf8da6c96823661518751f47992b86a /docs
parent512596d4254cb15ad329e3b78f3c867bd65208ca (diff)
parentb7371455e8da5f65ba4d1fb697fbe69b13be2d65 (diff)
downloadframeworks_base-7c0761052e0e1ae0ab89fc30247a0f88b8b52124.zip
frameworks_base-7c0761052e0e1ae0ab89fc30247a0f88b8b52124.tar.gz
frameworks_base-7c0761052e0e1ae0ab89fc30247a0f88b8b52124.tar.bz2
am b7371455: am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/security/security.jd17
1 files changed, 8 insertions, 9 deletions
diff --git a/docs/html/guide/topics/security/security.jd b/docs/html/guide/topics/security/security.jd
index da201c4..dbc9866 100644
--- a/docs/html/guide/topics/security/security.jd
+++ b/docs/html/guide/topics/security/security.jd
@@ -40,15 +40,14 @@ includes reading or writing the user's private data (such as contacts or
e-mails), reading or writing another application's files, performing
network access, keeping the device awake, etc.<p>
-<p>An application's process is a secure sandbox. It can't disrupt other
-applications, except by explicitly declaring the <em>permissions</em> it needs
-for additional capabilities not provided by the basic sandbox. These
-permissions it requests can be handled by the operating in various ways,
-typically by automatically allowing or disallowing based on certificates or
-by prompting the user. The permissions required by an application are declared
-statically in that application, so they can be known up-front at install time
-and will not change after that.</p>
-
+<p>An application's process runs in a security sandbox. The sandbox is designed
+to prevent applications from disrupting each other, except by explicitly
+declaring the <em>permissions</em> they need for additional capabilities not
+provided by the basic sandbox. The system handles requests for permissions
+in various ways, typically by automatically allowing or disallowing based on
+certificates or by prompting the user. The permissions required by an
+application are declared statically in that application, so they can be known
+up-front at install time and will not change after that.</p>
<a name="signing"></a>
<h2>Application Signing</h2>