From 96cb8d0b94b5737d0a06088bff3bf409ced3cd3d Mon Sep 17 00:00:00 2001
From: Debajit Ghosh <debajit@google.com>
Date: Tue, 29 Sep 2009 17:57:25 -0700
Subject: [PATCH] fix account permission strings.  this permission is used to
 protect more than just Google accounts.

---
 core/res/AndroidManifest.xml    | 7 ++-----
 core/res/res/values/strings.xml | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 60a2ecb17d254..47807c42b14a6 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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" />
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 7f97bd12a7380..0ff537d3f955e 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -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>