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

Commit 3f76ca47 authored by Debashish Chatterjee's avatar Debashish Chatterjee Committed by Android (Google) Code Review
Browse files

Merge "Step1 of renaming READ_WRITE_OWN_VOICEMAIL to ADD_VOICEMAILS."

parents c6600916 766839cb

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ package android { 
    field public static final java.lang.String ACCESS_SURFACE_FLINGER = "android.permission.ACCESS_SURFACE_FLINGER";

    field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";

    field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";

    field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";

    field public static final java.lang.String AUTHENTICATE_ACCOUNTS = "android.permission.AUTHENTICATE_ACCOUNTS";

    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";

    field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";

core/res/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -294,12 +294,21 @@ 


   <!-- Allows an application to read/write the voicemails owned by its own

        package. -->

   <!--  TODO: delete this permission when dependent content provider &

        application code has been migrated to use ADD_VOICEMAIL instead -->

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

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

        android:protectionLevel="dangerous"

        android:label="@string/permlab_readWriteOwnVoicemail"

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



   <!-- Allows an application to add voicemails into the system. -->

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

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

        android:protectionLevel="dangerous"

        android:label="@string/permlab_addVoicemail"

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



    <!-- ======================================= -->

    <!-- Permissions for accessing location info -->

    <!-- ======================================= -->

core/res/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -2165,6 +2165,14 @@ 
    <string name="permdesc_readWriteOwnVoicemail">Allows the application to store and retrieve only

      voicemails that its associated service can access.</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>

    <!-- 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_addVoicemail">Allows the application to add messages

      to 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. -->

    <string name="permlab_writeGeolocationPermissions">Modify Browser geolocation permissions</string>