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

Commit 50cddeca authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev

parents ec4bb45a 2ac40109

core/res/AndroidManifest.xml

+12 −4
Original line number Diff line number Diff line
@@ -1249,13 +1249,13 @@ 
        android:description="@string/permdesc_use_sip"

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



    <!-- @SystemApi Allows an application to request CallHandlerService implementations.

    <!-- @SystemApi Allows an application to bind to InCallService implementations.

         @hide -->

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

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

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

        android:protectionLevel="system|signature"

        android:description="@string/permdesc_bind_call_service"

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

        android:description="@string/permdesc_bind_incall_service"

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



    <!-- @SystemApi Allows an application to bind to ConnectionService implementations.

         @hide -->
@@ -1265,6 +1265,14 @@ 
                android:description="@string/permdesc_bind_connection_service"

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



    <!-- @SystemApi Allows an application to control the in-call experience.

         @hide -->

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

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

                android:protectionLevel="system|signature"

                android:description="@string/permdesc_control_incall_experience"

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



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

    <!-- Permissions for sdcard interaction -->

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

core/res/res/values/strings.xml

+7 −2
Original line number Diff line number Diff line
@@ -2112,15 +2112,20 @@ 
    <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_bind_call_service">interact with in-call screen</string>

    <string name="permlab_bind_incall_service">interact with in-call screen</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_bind_call_service">Allows the app to control when and how the user sees the in-call screen.</string>

    <string name="permdesc_bind_incall_service">Allows the app to control when and how the user sees the in-call screen.</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_bind_connection_service">interact with telephony services</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_bind_connection_service">Allows the app to interact with telephony services to make/receive 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_control_incall_experience">provide an in-call user experience</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_control_incall_experience">Allows the app to provide an in-call user experience.</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_readNetworkUsageHistory">read historical network usage</string>

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

telecomm/java/android/telecomm/InCallService.java

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.telecomm;



import android.annotation.SdkConstant;

import android.app.PendingIntent;

import android.app.Service;

import android.content.Intent;
@@ -39,6 +40,13 @@ import java.lang.String; 
 * {@hide}

 */

public abstract class InCallService extends Service {



    /**

     * The {@link Intent} that must be declared as handled by the service.

     */

    @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)

    public static final String SERVICE_INTERFACE = "android.telecomm.InCallService";



    private static final int MSG_SET_IN_CALL_ADAPTER = 1;

    private static final int MSG_ADD_CALL = 2;

    private static final int MSG_UPDATE_CALL = 3;