From 5e4554351045776c1cf2da77375f0ca8363d647f Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Wed, 25 Jun 2014 14:31:26 -0700
Subject: [PATCH] Add manage voicemail permission (1/4)

Bug: 6948882

Change-Id: I3367c20721b6e9572e79c7b4f42758b8c4e30372
---
 api/current.txt                 | 2 +-
 core/res/AndroidManifest.xml    | 8 ++++----
 core/res/res/values/strings.xml | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index c6fbca3d7848a..30662565c9241 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -82,6 +82,7 @@ package android {
     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";
@@ -114,7 +115,6 @@ package android {
     field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
     field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
     field public static final java.lang.String RECOVERY = "android.permission.RECOVERY";
-    field public static final java.lang.String REMOVE_VOICEMAIL = "com.android.voicemail.permission.REMOVE_VOICEMAIL";
     field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";
     field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
     field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index ca897d5efb62d..42b99c868edf5 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -659,12 +659,12 @@
         android:label="@string/permlab_addVoicemail"
         android:description="@string/permdesc_addVoicemail" />
 
-    <!-- Allows an application to remove any voicemails from the system. -->
-    <permission android:name="com.android.voicemail.permission.REMOVE_VOICEMAIL"
+    <!-- Allows an application to modify and remove existing voicemails in the system -->
+    <permission android:name="com.android.voicemail.permission.MANAGE_VOICEMAIL"
         android:permissionGroup="android.permission-group.VOICEMAIL"
         android:protectionLevel="dangerous"
-        android:label="@string/permlab_removeVoicemail"
-        android:description="@string/permdesc_removeVoicemail" />
+        android:label="@string/permlab_manageVoicemail"
+        android:description="@string/permdesc_manageVoicemail" />
 
     <!-- Allows an application to read all the voicemails in the system. -->
     <permission android:name="com.android.voicemail.permission.READ_ALL_VOICEMAIL"
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index db02279792fda..4ef262a1e2a35 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2969,12 +2969,13 @@
       not implement this feature.</string>
 
     <!-- Title of an application permission, listed so the user can choose whether
-        they want to allow the application to remove voicemails from the user's voicemail
+        they want to allow the application to modify and remove voicemails in the user's voicemail
         inbox. [CHAR LIMIT=NONE] -->
-    <string name="permlab_removeVoicemail">remove voicemails</string>
+    <string name="permlab_manageVoicemail">manage voicemails</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_removeVoicemail">Allows the app to remove messages from your voicemail inbox.</string>
+        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>
 
     <!-- Title of an application permission, listed so the user can choose whether
         they want to allow the application to do this. [CHAR LIMIT=NONE] -->