Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99bd4eab authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Add manage voicemail permission (1/4)"

parents 82ff6ff5 5e455435

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -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"

core/res/res/values/strings.xml

+5 −4
Original line number Diff line number Diff line
@@ -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] -->