summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Svetoslav Ganov <svetoslavganov@google.com> 2015-07-17 23:54:11 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-17 23:54:11 +0000
commita90ce1f985f99e39a7857b7393227c17f6e41b7a (patch)
tree1c21340af7c7b7f4fe0da3a0012edfe5a04eb17b
parent0ee8f8ec2adb2541cec2bee6aa315fe000882b91 (diff)
parent9fe97395488402714d023f20d488b19a7d477c78 (diff)
am 9fe97395: am fd050586: am fa24a782: am 41ec3923: am fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
* commit '9fe97395488402714d023f20d488b19a7d477c78': Revert "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 3fe41e54fb90..f04790e4157b 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<>();