Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2a35c8d7: Merge change I96cb8d0b into eclair

Browse Source 
Merge commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782' into eclair-plus-aosp

* commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782':
  fix account permission strings.  this permission is used to protect more than just Google accounts.
This commit is contained in:
Debajit Ghosh
2009-09-29 22:13:49 -07:00
committed by Android Git Automerger
parent 5495ee0c09 2a35c8d701
commit ebefded1cc
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/AndroidManifest.xml
View File

@@ -342,11 +342,8 @@
<!-- ================================== -->
<eat-comment />
<!-- Permissions for direct access to Google accounts.
Note that while right now this is only used for Google accounts,
we expect in the future to have a more general account management
facility so this is specified as a general platform permission
group for accessing accounts. -->
<!-- Permissions for direct access to the accounts managed
by the Account Manager. -->
<permission-group android:name="android.permission-group.ACCOUNTS"
android:label="@string/permgrouplab_accounts"
android:description="@string/permgroupdesc_accounts" />

4
core/res/res/values/strings.xml
View File

@@ -337,9 +337,9 @@
various network features.</string>
<!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permgrouplab_accounts">Your Google accounts</string>
<string name="permgrouplab_accounts">Your accounts</string>
<!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permgroupdesc_accounts">Access the available Google accounts.</string>
<string name="permgroupdesc_accounts">Access the available accounts.</string>
<!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permgrouplab_hardwareControls">Hardware controls</string>