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

Commit 04f3eebe authored by Santos Cordon's avatar Santos Cordon Committed by Android Git Automerger
Browse files

am 27be7b35: Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 

* commit '27be7b35':
  Split Telecom PhoneAccount registration permissions.
parents a79cf3c1 27be7b35

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -113,8 +113,9 @@ package android { 
    field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS";

    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 REGISTER_CALL_PROVIDER = "android.permission.REGISTER_CALL_PROVIDER";

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

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

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

    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

+16 −5
Original line number Diff line number Diff line
@@ -1269,13 +1269,24 @@ 
        android:description="@string/permdesc_use_sip"

        android:label="@string/permlab_use_sip" />



    <!-- Protects the ability to register any PhoneAccount with a capability flags of either

         PhoneAccount#CAPABILITY_CALL_PROVIDER or PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. -->

    <permission android:name="android.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION"

    <!-- Protects the ability to register any PhoneAccount with

         PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. This capability indicates that the PhoneAccount

         corresponds to a device SIM. -->

    <permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION"

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

        android:description="@string/permdesc_register_provider"

        android:label="@string/permlab_register_provider" />

        android:protectionLevel="system|signature"

        android:description="@string/permdesc_register_sim_subscription"

        android:label="@string/permlab_register_sim_subscription" />



    <!-- Protects the ability to register any PhoneAccount with

         PhoneAccount#CAPABILITY_CALL_PROVIDER. -->

    <permission android:name="android.permission.REGISTER_CALL_PROVIDER"

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

        android:description="@string/permdesc_register_call_provider"

        android:label="@string/permlab_register_call_provider" />



    <!-- Protects the ability to register any PhoneAccount with

         PhoneAccount#CAPABILITY_CONNECTION_MANAGER -->

    <permission android:name="android.permission.REGISTER_CONNECTION_MANAGER"

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

        android:description="@string/permdesc_connection_manager"

core/res/res/values/strings.xml

+7 −2
Original line number Diff line number Diff line
@@ -2115,9 +2115,14 @@ 
    <string name="permdesc_use_sip">Allows the app to make and receive SIP calls.</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_register_provider">register new telecom connection</string>

    <string name="permlab_register_sim_subscription">register new telecom SIM connections</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_register_provider">Allows the app to register new telecom connections.</string>

    <string name="permdesc_register_sim_subscription">Allows the app to register new telecom SIM connections.</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_register_call_provider">register new telecom connections</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_register_call_provider">Allows the app to register new telecom connections.</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_connection_manager">manage telecom connections</string>