From 5e33fbe94c189b4c31b44c67a90022845fe85113 Mon Sep 17 00:00:00 2001
From: Andrew Solovay <asolovay@google.com>
Date: Wed, 2 Dec 2015 10:33:24 -0800
Subject: [PATCH] docs: Clarified when GET_ACCOUNTS is necessary

Per bug report, clarified when an app needs GET_ACCOUNTS permission
to read the current account's information.

Along the same lines, clarified that the CONTACTS permissions group
regulates permissions for all accounts and contacts on the device, not
just the user's contact info (since GET_ACCOUNTS is in CONTACTS, and,
as noted, GET_ACCOUNTS applies to other users' info).

See first comment for doc stage location.

bug: 23589012
Change-Id: Ia87565936787dd85daedfb641883e7cbf778f2bd
---
 core/res/AndroidManifest.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 56689cc15e6d8..68ee8b6e47b91 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -330,7 +330,8 @@
     <!-- ====================================================================== -->
     <eat-comment />
 
-    <!-- Used for runtime permissions related to user's contacts and profile. -->
+    <!-- Used for runtime permissions related to contacts and profiles on this
+        device. -->
     <permission-group android:name="android.permission-group.CONTACTS"
         android:icon="@drawable/perm_group_contacts"
         android:label="@string/permgrouplab_contacts"
@@ -1037,7 +1038,15 @@
     <eat-comment />
 
     <!-- Allows access to the list of accounts in the Accounts Service.
-        <p>Protection level: dangerous
+
+    <p class="note"><strong>Note:</strong> Beginning with Android 6.0 (API level
+    23), if an app shares the signature of the authenticator that manages an
+    account, it does not need <code>"GET_ACCOUNTS"</code> permission to read
+    information about that account. On Android 5.1 and lower, all apps need
+    <code>"GET_ACCOUNTS"</code> permission to read information about any
+    account.</p>
+
+    <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.GET_ACCOUNTS"
         android:permissionGroup="android.permission-group.CONTACTS"