Rename voicemail permissions
Rename READ_ALL_VOICEMAIL to READ_VOICEMAIL, and MANAGE_VOICEMAIL
to WRITE_VOICEMAIL
Bug: 16400686
Change-Id: I4c87a7e2fb3aa71d7de3865301f110bcfb29221b
diff --git a/api/current.txt b/api/current.txt
index 2ee881d..95bc9b0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -84,7 +84,6 @@
field public static final java.lang.String MANAGE_ACCOUNTS = "android.permission.MANAGE_ACCOUNTS";
field public static final java.lang.String MANAGE_APP_TOKENS = "android.permission.MANAGE_APP_TOKENS";
field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
- field public static final java.lang.String MANAGE_VOICEMAIL = "com.android.voicemail.permission.MANAGE_VOICEMAIL";
field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
field public static final java.lang.String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";
field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
@@ -94,7 +93,6 @@
field public static final java.lang.String NFC = "android.permission.NFC";
field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
field public static final java.lang.String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
- field public static final java.lang.String READ_ALL_VOICEMAIL = "com.android.voicemail.permission.READ_ALL_VOICEMAIL";
field public static final java.lang.String READ_CALENDAR = "android.permission.READ_CALENDAR";
field public static final java.lang.String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
field public static final java.lang.String READ_CONTACTS = "android.permission.READ_CONTACTS";
@@ -110,6 +108,7 @@
field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
field public static final java.lang.String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS";
field public static final java.lang.String READ_USER_DICTIONARY = "android.permission.READ_USER_DICTIONARY";
+ field public static final java.lang.String READ_VOICEMAIL = "com.android.voicemail.permission.READ_VOICEMAIL";
field public static final java.lang.String REBOOT = "android.permission.REBOOT";
field public static final java.lang.String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED";
field public static final java.lang.String RECEIVE_MMS = "android.permission.RECEIVE_MMS";
@@ -160,6 +159,7 @@
field public static final deprecated java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM";
field public static final java.lang.String WRITE_SYNC_SETTINGS = "android.permission.WRITE_SYNC_SETTINGS";
field public static final java.lang.String WRITE_USER_DICTIONARY = "android.permission.WRITE_USER_DICTIONARY";
+ field public static final java.lang.String WRITE_VOICEMAIL = "com.android.voicemail.permission.WRITE_VOICEMAIL";
}
public static final class Manifest.permission_group {
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index ba65d63..fc55116 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -677,18 +677,18 @@
android:description="@string/permdesc_addVoicemail" />
<!-- Allows an application to modify and remove existing voicemails in the system -->
- <permission android:name="com.android.voicemail.permission.MANAGE_VOICEMAIL"
+ <permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"
android:permissionGroup="android.permission-group.VOICEMAIL"
android:protectionLevel="dangerous"
- android:label="@string/permlab_manageVoicemail"
- android:description="@string/permdesc_manageVoicemail" />
+ android:label="@string/permlab_writeVoicemail"
+ android:description="@string/permdesc_writeVoicemail" />
- <!-- Allows an application to read all the voicemails in the system. -->
- <permission android:name="com.android.voicemail.permission.READ_ALL_VOICEMAIL"
+ <!-- Allows an application to read voicemails in the system. -->
+ <permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"
android:permissionGroup="android.permission-group.VOICEMAIL"
android:protectionLevel="dangerous"
- android:label="@string/permlab_readAllVoicemail"
- android:description="@string/permdesc_readAllVoicemail" />
+ android:label="@string/permlab_readVoicemail"
+ android:description="@string/permdesc_readVoicemail" />
<!-- =============================================== -->
<!-- Permissions for enabling accessibility features -->
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index f133707..0d9da35 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2983,11 +2983,11 @@
<!-- Title of an application permission, listed so the user can choose whether
they want to allow the application to modify and remove voicemails in the user's voicemail
inbox. [CHAR LIMIT=NONE] -->
- <string name="permlab_manageVoicemail">manage voicemails</string>
+ <string name="permlab_writeVoicemail">write voicemails</string>
<!-- Description of an application permission, listed so the user can choose whether
they want to allow the application to modify and remove voicemails in the user's voicemail
inbox. [CHAR LIMIT=NONE] -->
- <string name="permdesc_manageVoicemail">Allows the app to modify and remove messages from your voicemail inbox.</string>
+ <string name="permdesc_writeVoicemail">Allows the app to modify and remove messages from your voicemail inbox.</string>
<!-- Title of an application permission, listed so the user can choose whether
they want to allow the application to do this. [CHAR LIMIT=NONE] -->
@@ -2999,10 +2999,10 @@
<!-- Title of an application permission, listed so the user can choose whether
they want to allow the application to do this. [CHAR LIMIT=NONE] -->
- <string name="permlab_readAllVoicemail">read all voicemail</string>
+ <string name="permlab_readVoicemail">read voicemail</string>
<!-- Description of an application permission, listed so the user can choose whether
they want to allow the application to do this. [CHAR LIMIT=NONE] -->
- <string name="permdesc_readAllVoicemail">Allows the app to read all your voicemails.</string>
+ <string name="permdesc_readVoicemail">Allows the app to read your voicemails.</string>
<!-- Title of an application permission, listed so the user can choose whether
they want to allow the application to do this. -->