summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-06-03 12:57:06 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-06-03 12:57:06 -0700
commit85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e (patch)
treee4c28e458a18a6481bb5b115c01cb785b1609821
parent28a92b2e76a13c18dc23e5239717b122a174182f (diff)
parent5bacbfd39ba71089f9d599e5954aaa7cbee630a7 (diff)
Merge "Doc change: Adjust security sandbox description." into froyo
-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 da201c44040a..dbc9866e859a 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>