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

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

Merge "Add REMOVE_VOICEMAIL permission to system"

parents 3b6ec30b 5a2f488b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 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

+8 −1
Original line number Diff line number Diff line
@@ -657,6 +657,13 @@ 
        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"

        android:permissionGroup="android.permission-group.VOICEMAIL"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_removeVoicemail"

        android:description="@string/permdesc_removeVoicemail" />



    <!-- Allows an application to read all the voicemails in the system. -->

    <permission android:name="com.android.voicemail.permission.READ_ALL_VOICEMAIL"

        android:permissionGroup="android.permission-group.VOICEMAIL"

core/res/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -2962,6 +2962,14 @@ 
      an installed alarm clock app. Some alarm clock apps may

      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

        inbox. [CHAR LIMIT=NONE] -->

    <string name="permlab_removeVoicemail">remove 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>



    <!-- 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_addVoicemail">add voicemail</string>