summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Svet Ganov <svetoslavganov@google.com> 2015-07-17 21:00:52 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-17 21:00:52 +0000
commite29a61a0b9563cbafabb1f90ff9d9c6c5a0c7978 (patch)
treecd858b1b51c81a8b5c9f6b634420da5938e4c9de
parentb00f3e4ff96fd31d46a1aa78bc20fefda4d5e305 (diff)
parentae61307d006d1204581b670e3c7f799ef48ba7f2 (diff)
am ae61307d: am fa9a616d: am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
* commit 'ae61307d006d1204581b670e3c7f799ef48ba7f2': Do not auto grant GET_ACCOUNTS as it is temporarily normal
-rw-r--r--services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index b76db4133cac..609a5dfb7c77 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -72,7 +72,7 @@ final class DefaultPermissionGrantPolicy {
static {
CONTACTS_PERMISSIONS.add(Manifest.permission.READ_CONTACTS);
CONTACTS_PERMISSIONS.add(Manifest.permission.WRITE_CONTACTS);
- CONTACTS_PERMISSIONS.add(Manifest.permission.GET_ACCOUNTS);
+// CONTACTS_PERMISSIONS.add(Manifest.permission.GET_ACCOUNTS);
}
private static final Set<String> LOCATION_PERMISSIONS = new ArraySet<>();