diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | 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 e6d2146..1aac2fd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -83,6 +83,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"; @@ -115,7 +116,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 4061c22..59399d2 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -670,12 +670,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 a5bb40a..e8bd99a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2981,12 +2981,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] --> |