diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-17 20:27:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-17 20:27:36 +0000 |
| commit | 4a1421f3c50d53a7e2230f41854df12215378ef2 (patch) | |
| tree | 3848b04b14dc42b1c74e3e839649dd9f7da6efbf /services | |
| parent | 094c82ada3799045588790252a64806b9930f8c2 (diff) | |
| parent | 33852d8cd21434b4106b8f2c504752ef34abb2da (diff) | |
| download | frameworks_base-4a1421f3c50d53a7e2230f41854df12215378ef2.zip frameworks_base-4a1421f3c50d53a7e2230f41854df12215378ef2.tar.gz frameworks_base-4a1421f3c50d53a7e2230f41854df12215378ef2.tar.bz2 | |
Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java | 2 |
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 b76db41..609a5df 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<>(); |