From 26f501d064ee05cf853bce5df7e7629bdeeb074a Mon Sep 17 00:00:00 2001
From: Andrew Solovay <asolovay@google.com>
Date: Tue, 22 Dec 2015 14:19:45 -0800
Subject: [PATCH] docs: Fixed misleading information about permissions

Doc had said that users have to grant all permissions at install time
(which was misleading--users don't have to grant normal permissions--
and wrong if app and device use runtime permissions).

Changed the text to just say that the user needs to explicitly grant
"these permissions" (the permissions being talked about are all
dangerous), and pointed the reader to the Permissions training class.

I'll build and stage, but since it's a one-sentence fix I'll go ahead
and submit if it looks good.

bug: 25412683
Change-Id: Idc17828f2958d4f8900d29e564c05c54bf3ce753
---
 docs/html/guide/components/fundamentals.jd | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/html/guide/components/fundamentals.jd b/docs/html/guide/components/fundamentals.jd
index fd1a7a859c581..ca111962b8628 100644
--- a/docs/html/guide/components/fundamentals.jd
+++ b/docs/html/guide/components/fundamentals.jd
@@ -59,8 +59,9 @@ they are able to access each other's files.  To conserve system resources, apps
 same user ID can also arrange to run in the same Linux process and share the same VM (the
 apps must also be signed with the same certificate).</li>
   <li>An app can request permission to access device data such as the user's
-contacts, SMS messages, the mountable storage (SD card), camera, Bluetooth, and more. All
-app permissions must be granted by the user at install time.</li>
+contacts, SMS messages, the mountable storage (SD card), camera, Bluetooth, and more. The user has
+to explicitly grant these permissions. For more information, see
+<a href="{@docRoot}training/permissions/index.html">Working with System Permissions</a>.</li>
 </ul>
 
 <p>That covers the basics regarding how an Android app exists within the system. The rest of
@@ -390,7 +391,7 @@ for users when they search for apps from their device.</p>
 
 <p>For example, if your app requires a camera and uses APIs introduced in Android 2.1 (<a
 href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API Level</a> 7),
-you should declare these as requirements in your manifest file like this:</p> 
+you should declare these as requirements in your manifest file like this:</p>
 
 <pre>
 &lt;manifest ... >