diff options
| -rw-r--r-- | core/res/AndroidManifest.xml | 16 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | telecomm/java/android/telecomm/InCallService.java | 8 |
3 files changed, 27 insertions, 6 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index aee3090..f707b20 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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 --> <!-- ================================== --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index c68f355..5429e59 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2112,9 +2112,9 @@ <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> @@ -2122,6 +2122,11 @@ <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. --> <string name="permdesc_readNetworkUsageHistory">Allows the app to read historical network usage for specific networks and apps.</string> diff --git a/telecomm/java/android/telecomm/InCallService.java b/telecomm/java/android/telecomm/InCallService.java index de05d1c..5795e0e 100644 --- a/telecomm/java/android/telecomm/InCallService.java +++ b/telecomm/java/android/telecomm/InCallService.java @@ -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; |