diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 58296deb5dd69..466fd24c39c50 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -144,39 +144,11 @@
+ without their direct involvement. -->
-
-
-
-
-
-
-
-
-
-
@@ -188,7 +160,26 @@
receiving or reading an MMS. -->
+ android:icon="@drawable/perm_group_messages"
+ android:description="@string/permgroupdesc_messages"
+ android:permissionGroupFlags="personalInfo"
+ android:priority="360"/>
+
+
+
+
+
+
@@ -254,22 +245,25 @@
android:description="@string/permdesc_receiveWapPush" />
-
+
-
-
+
@@ -277,7 +271,7 @@
@@ -291,7 +285,7 @@
@@ -299,11 +293,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -376,23 +437,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -407,7 +493,9 @@
+ android:description="@string/permgroupdesc_location"
+ android:permissionGroupFlags="personalInfo"
+ android:priority="330" />
+ android:icon="@drawable/perm_group_network"
+ android:description="@string/permgroupdesc_network"
+ android:priority="270" />
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -534,7 +651,10 @@
by the Account Manager. -->
+ android:icon="@drawable/perm_group_accounts"
+ android:description="@string/permgroupdesc_accounts"
+ android:permissionGroupFlags="personalInfo"
+ android:priority="200" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -574,49 +765,8 @@
the device. This includes audio, the camera, vibrator, etc. -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:description="@string/permgroupdesc_hardwareControls"
+ android:priority="260"/>
@@ -653,19 +803,69 @@
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
android:protectionLevel="signature" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ telephony state: placing calls, intercepting outgoing calls, reading
+ and modifying the phone state. -->
+ android:icon="@drawable/perm_group_phone_calls"
+ android:description="@string/permgroupdesc_phoneCalls"
+ android:permissionGroupFlags="personalInfo"
+ android:priority="370" />
@@ -696,6 +896,22 @@
android:permissionGroup="android.permission-group.PHONE_CALLS"
android:protectionLevel="signature|system" />
+
+
+
+
+
+
@@ -704,7 +920,10 @@
+ android:icon="@drawable/perm_group_storage"
+ android:description="@string/permgroupdesc_storage"
+ android:permissionGroupFlags="personalInfo"
+ android:priority="240" />
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+ android:description="@string/permdesc_disableKeyguard"
+ android:label="@string/permlab_disableKeyguard" />
-
-
+
+
+
+
-
-
+
+
@@ -816,14 +1027,14 @@
@@ -836,6 +1047,202 @@
android:label="@string/permlab_startAnyActivity"
android:description="@string/permdesc_startAnyActivity" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -884,17 +1275,6 @@
android:label="@string/permlab_retrieve_window_content"
android:description="@string/permdesc_retrieve_window_content" />
-
-
-
@@ -953,52 +1333,17 @@
android:label="@string/permlab_broadcastSticky"
android:description="@string/permdesc_broadcastSticky" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1042,34 +1387,6 @@
android:label="@string/permlab_asec_rename"
android:description="@string/permdesc_asec_rename" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:description="@string/permgroupdesc_developmentTools"
+ android:priority="310" />
Your personal information
- Direct access to your contacts
- and calendar stored on the tablet.
+ Direct access to information about you, stored in on your contact card.
+
+
+ Your social information
- Direct access to your contacts
- and calendar stored on the phone.
+ Direct access to information about your contacts and social connections.
Your location
@@ -417,6 +418,91 @@
Access various network features.
+
+ Bluetooth
+
+ Access devices and networks through Bluetooth.
+
+
+ Short-range Networks
+
+ Access devices through short-range networks such as NFC.
+
+
+ Audio Settings
+
+ Change audio settings.
+
+
+ Affects Battery
+
+ Use features that can quickly drain battery.
+
+
+ Calendar
+
+ Direct access to calendar and events.
+
+
+ Read User Dictionary
+
+ Read words in user dictionary.
+
+
+ Write User Dictionary
+
+ Add words to the user dictionary.
+
+
+ Bookmarks and History
+
+ Direct access to bookmarks and browser history.
+
+
+ Alarm
+
+ Set the alarm clock.
+
+
+ Voicemail
+
+ Direct access to voicemail.
+
+
+ Microphone
+
+ Direct access to the microphone to record audio.
+
+
+ Camera
+
+ Direct access to camera for image or video capture.
+
+
+ Your applications information
+
+ Ability to affect behavior of other applications on your device.
+
+
+ Wallpaper
+
+ Change the device wallpaper settings.
+
+
+ Clock
+
+ Change the device time or timezone.
+
+
+ Status Bar
+
+ Change the device status bar settings.
+
+
+ Sync Settings
+
+ Access to the sync settings.
+
Your accounts
@@ -442,6 +528,11 @@
Features only needed for app developers.
+
+ Other Application UI
+
+ Effect the UI of other applications.
+
Storage
@@ -549,7 +640,6 @@
retrieve running apps
-
Allows the app to retrieve information
about currently and recently running tasks. This may allow the app to
discover information about which applications are used on the device.