Merge "Remove the empty accounts group and not needed storage resources." into mnc-dev
diff --git a/api/current.txt b/api/current.txt
index 3ae5372..8a82ed0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -143,7 +143,6 @@
public static final class Manifest.permission_group {
ctor public Manifest.permission_group();
- field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";
field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";
diff --git a/api/system-current.txt b/api/system-current.txt
index 8a633df..a382fb0 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -232,7 +232,6 @@
public static final class Manifest.permission_group {
ctor public Manifest.permission_group();
- field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";
field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index bd9b014..7f61a04 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1024,15 +1024,6 @@
<!-- ================================== -->
<eat-comment />
- <!-- 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:icon="@drawable/perm_group_accounts"
- android:description="@string/permgroupdesc_accounts"
- android:permissionGroupFlags="personalInfo"
- android:priority="1000" />
-
<!-- Allows access to the list of accounts in the Accounts Service.
<p>Protection level: normal
-->
@@ -1045,7 +1036,6 @@
<!-- @SystemApi Allows applications to call into AccountAuthenticators.
<p>Not for use by third-party applications. -->
<permission android:name="android.permission.ACCOUNT_MANAGER"
- android:permissionGroup="android.permission-group.ACCOUNTS"
android:protectionLevel="signature" />
<!-- ================================== -->
diff --git a/core/res/res/drawable-hdpi/perm_group_accounts.png b/core/res/res/drawable-hdpi/perm_group_accounts.png
deleted file mode 100644
index 5ac28e7..0000000
--- a/core/res/res/drawable-hdpi/perm_group_accounts.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-mdpi/perm_group_accounts.png b/core/res/res/drawable-mdpi/perm_group_accounts.png
deleted file mode 100644
index ce4e683..0000000
--- a/core/res/res/drawable-mdpi/perm_group_accounts.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/perm_group_accounts.png b/core/res/res/drawable-xhdpi/perm_group_accounts.png
deleted file mode 100644
index ca622e9..0000000
--- a/core/res/res/drawable-xhdpi/perm_group_accounts.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/ic_perm_group_accounts.png b/core/res/res/drawable-xxhdpi/ic_perm_group_accounts.png
deleted file mode 100644
index f30fcd4c..0000000
--- a/core/res/res/drawable-xxhdpi/ic_perm_group_accounts.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/ic_perm_group_storage.png b/core/res/res/drawable-xxhdpi/ic_perm_group_storage.png
deleted file mode 100644
index d3937db..0000000
--- a/core/res/res/drawable-xxhdpi/ic_perm_group_storage.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/perm_group_accounts.png b/core/res/res/drawable-xxhdpi/perm_group_accounts.png
deleted file mode 100644
index 2fc3baa..0000000
--- a/core/res/res/drawable-xxhdpi/perm_group_accounts.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xxxhdpi/perm_group_accounts.png b/core/res/res/drawable-xxxhdpi/perm_group_accounts.png
deleted file mode 100644
index 1d9db83..0000000
--- a/core/res/res/drawable-xxxhdpi/perm_group_accounts.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 5288fa3..bf6b015 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -676,11 +676,6 @@
Malicious apps may interfere with the performance or operation of your
device when an emergency cell broadcast is received.</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 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 accounts.</string>
-
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_subscribedFeedsRead">read subscribed feeds</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
