diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-22 21:41:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 21:41:40 +0000 |
| commit | 3d6f606031da248a3b1fd6f0f569ac33a26c0b5e (patch) | |
| tree | 964838ddbe20f03310c6f144883da088ec517daa /services | |
| parent | 3f2c51084b9d9578532c8a88e7a5444eeedc86c2 (diff) | |
| parent | 2062eeff0156bc4e119398f1736e699d90ad8345 (diff) | |
| download | frameworks_base-3d6f606031da248a3b1fd6f0f569ac33a26c0b5e.zip frameworks_base-3d6f606031da248a3b1fd6f0f569ac33a26c0b5e.tar.gz frameworks_base-3d6f606031da248a3b1fd6f0f569ac33a26c0b5e.tar.bz2 | |
Merge "Add a privileged permission to get user accounts" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/accounts/AccountManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index cb294fd..32fd56a 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -3799,7 +3799,8 @@ public class AccountManagerService * access accounts of the specified account. */ boolean isPermitted = - isPermitted(callingUid, Manifest.permission.GET_ACCOUNTS); + isPermitted(callingUid, Manifest.permission.GET_ACCOUNTS, + Manifest.permission.GET_ACCOUNTS_PRIVILEGED); boolean isAccountManagedByCaller = isAccountManagedByCaller(accountType, callingUid); Log.w(TAG, String.format( "isReadAccountPermitted: isPermitted: %s, isAM: %s", |