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

Commit 024aaf23 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Adding Dynamic ImsService Binding (1/3) 

Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option

Test: Unit Tests in opt/telephony
Bug: 30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3
parent 6d064d87

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -437,6 +437,8 @@ LOCAL_SRC_FILES += \ 
        telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl \

        telephony/java/com/android/ims/internal/IImsMultiEndpoint.aidl \

	telephony/java/com/android/ims/internal/IImsService.aidl \

	telephony/java/com/android/ims/internal/IImsServiceController.aidl \

	telephony/java/com/android/ims/internal/IImsServiceFeatureListener.aidl \

	telephony/java/com/android/ims/internal/IImsStreamMediaSession.aidl \

	telephony/java/com/android/ims/internal/IImsUt.aidl \

	telephony/java/com/android/ims/internal/IImsUtListener.aidl \

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37004,6 +37004,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING = "ci_action_on_sys_update_extra_string";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING = "ci_action_on_sys_update_extra_val_string";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";

    field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

api/system-current.txt

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

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

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

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

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

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

    field public static final java.lang.String BIND_KEYGUARD_APPWIDGET = "android.permission.BIND_KEYGUARD_APPWIDGET";
@@ -40173,6 +40174,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING = "ci_action_on_sys_update_extra_string";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING = "ci_action_on_sys_update_extra_val_string";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";

    field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";
@@ -41050,6 +41052,15 @@ package android.telephony.gsm { 














}



























package android.telephony.ims {

























  public class ImsServiceBase extends android.app.Service {













    ctor public ImsServiceBase();













    method public android.os.IBinder onBind(android.content.Intent);













  }

























}



























package android.test {





























  public abstract deprecated class ActivityInstrumentationTestCase<T extends android.app.Activity> extends android.test.ActivityTestCase {

























api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -37086,6 +37086,7 @@ package android.telephony {













    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING = "ci_action_on_sys_update_extra_string";















    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING = "ci_action_on_sys_update_extra_val_string";















    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";













    field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";















    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";















    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";















    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

























core/res/AndroidManifest.xml



+10
−0




























Original line number
Diff line number
Diff line








@@ -1576,6 +1576,16 @@













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















        android:protectionLevel="signature|privileged" />





























    <!-- Must be required by an ImsService to ensure that only the













         system can bind to it.













         <p>Protection level: signature|privileged













         @SystemApi













         @hide













    -->













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













        android:protectionLevel="signature|privileged" />











































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















    <!-- Permissions for sdcard interaction -->















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