diff options
| author | Carlos Valdivia <carlosvaldivia@google.com> | 2015-06-11 20:04:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 20:04:44 +0000 |
| commit | d0041e5f474f4e795d6bc9e5eeaec4098949897c (patch) | |
| tree | 253f82ccd582d44409c73074ca5eff89523f14e2 /core/res/AndroidManifest.xml | |
| parent | c8488e99e85ae5252e6078c00d123f1364aef25d (diff) | |
| parent | dcddc476651deb72a27798de56eef584e5be5d32 (diff) | |
| download | frameworks_base-d0041e5f474f4e795d6bc9e5eeaec4098949897c.zip frameworks_base-d0041e5f474f4e795d6bc9e5eeaec4098949897c.tar.gz frameworks_base-d0041e5f474f4e795d6bc9e5eeaec4098949897c.tar.bz2 | |
Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a16a2f4..54123f5 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -980,11 +980,33 @@ <!-- Allows access to the list of accounts in the Accounts Service --> <permission android:name="android.permission.GET_ACCOUNTS" - android:permissionGroup="android.permission-group.CONTACTS" + android:permissionGroup="android.permission-group.ACCOUNTS" android:protectionLevel="normal" android:description="@string/permdesc_getAccounts" android:label="@string/permlab_getAccounts" /> + <!-- Allows an application to act as an AccountAuthenticator for + the AccountManager --> + <permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" + android:permissionGroup="android.permission-group.ACCOUNTS" + android:protectionLevel="dangerous" + android:label="@string/permlab_authenticateAccounts" + android:description="@string/permdesc_authenticateAccounts" /> + + <!-- Allows an application to request authtokens from the AccountManager --> + <permission android:name="android.permission.USE_CREDENTIALS" + android:permissionGroup="android.permission-group.ACCOUNTS" + android:protectionLevel="dangerous" + android:label="@string/permlab_useCredentials" + android:description="@string/permdesc_useCredentials" /> + + <!-- Allows an application to manage the list of accounts in the AccountManager --> + <permission android:name="android.permission.MANAGE_ACCOUNTS" + android:permissionGroup="android.permission-group.ACCOUNTS" + android:protectionLevel="dangerous" + android:label="@string/permlab_manageAccounts" + android:description="@string/permdesc_manageAccounts" /> + <!-- @SystemApi Allows applications to call into AccountAuthenticators. <p>Not for use by third-party applications. --> <permission android:name="android.permission.ACCOUNT_MANAGER" |