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

Merge change I96cb8d0b into eclair

Browse Source 
* changes:
  fix account permission strings.  this permission is used to protect more than just Google accounts.
This commit is contained in:
Android (Google) Code Review
2009-09-30 01:06:07 -04:00
parent b1b289a01d 96cb8d0b94
commit 2a35c8d701
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 /> <eat-comment />
<!-- Permissions for direct access to Google accounts. <!-- Permissions for direct access to the accounts managed
Note that while right now this is only used for Google accounts, by the Account Manager. -->
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. -->
<permission-group android:name="android.permission-group.ACCOUNTS" <permission-group android:name="android.permission-group.ACCOUNTS"
android:label="@string/permgrouplab_accounts" android:label="@string/permgrouplab_accounts"
android:description="@string/permgroupdesc_accounts" /> android:description="@string/permgroupdesc_accounts" />

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

@@ -337,9 +337,9 @@
various network features.</string> 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. --> <!-- 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. --> <!-- 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. --> <!-- 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> <string name="permgrouplab_hardwareControls">Hardware controls</string>