diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-17 22:39:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-17 22:39:34 +0000 |
| commit | fbc6f2cb6c5313ac246b8554764a719dd06582fc (patch) | |
| tree | c7f3ed2119250a3201e515633261e323d87b8b04 /services | |
| parent | 5c269121d8ea0bf3f530f2314695e189ffdb3165 (diff) | |
| parent | 54a0cf1b95d5dfc40ef26035dfc4f45c0e7e3fe3 (diff) | |
| download | frameworks_base-fbc6f2cb6c5313ac246b8554764a719dd06582fc.zip frameworks_base-fbc6f2cb6c5313ac246b8554764a719dd06582fc.tar.gz frameworks_base-fbc6f2cb6c5313ac246b8554764a719dd06582fc.tar.bz2 | |
Merge "Revert "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 3fe41e5..f04790e 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<>(); |