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

Commit 4099874d authored by James Lin's avatar James Lin Committed by android-build-merger
Browse files

Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP... 

Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported" am: 74ad1b81
am: 54e73b6e

Change-Id: I8d97fc88798f4f120a4fc29081984d64051a9abd
parents a15aa821 54e73b6e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44167,6 +44167,7 @@ package android.telephony { 
    field public static final String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";

    field public static final String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";

    field public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";

    field public static final String KEY_USE_RCS_SIP_OPTIONS_BOOL = "use_rcs_sip_options_bool";

    field public static final String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";

    field public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

telephony/java/android/telephony/CarrierConfigManager.java

+9 −3
Original line number Diff line number Diff line
@@ -1732,9 +1732,8 @@ public class CarrierConfigManager { 
            "allow_emergency_video_calls_bool";



    /**

     * Flag indicating whether the carrier supports RCS presence indication for video calls.  When

     * {@code true}, the carrier supports RCS presence indication for video calls.  When presence

     * is supported, the device should use the

     * Flag indicating whether the carrier supports RCS presence indication for

     * User Capability Exchange (UCE).  When presence is supported, the device should use the

     * {@link android.provider.ContactsContract.Data#CARRIER_PRESENCE} bit mask and set the

     * {@link android.provider.ContactsContract.Data#CARRIER_PRESENCE_VT_CAPABLE} bit to indicate

     * whether each contact supports video calling.  The UI is made aware that presence is enabled
@@ -1744,6 +1743,12 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";



    /**

     * Flag indicating whether the carrier supports RCS SIP OPTIONS indication for

     * User Capability Exchange (UCE).

     */

    public static final String KEY_USE_RCS_SIP_OPTIONS_BOOL = "use_rcs_sip_options_bool";



    /**

     * The duration in seconds that platform call and message blocking is disabled after the user

     * contacts emergency services. Platform considers values for below cases:
@@ -3373,6 +3378,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);

        sDefaults.putInt(KEY_EMERGENCY_SMS_MODE_TIMER_MS_INT, 0);

        sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);

        sDefaults.putBoolean(KEY_USE_RCS_SIP_OPTIONS_BOOL, false);

        sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);

        sDefaults.putInt(

                KEY_CDMA_ROAMING_MODE_INT, TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT);