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

Commit 79dc6fb8 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add CarrierConfig key for RTT support" 

am: e5a91366

Change-Id: I035f9ae243dfe1a8c3bc1300851e88fdcb73dafd
parents b1ba1352 e5a91366

api/current.txt

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

    field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

    field public static final java.lang.String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL = "restart_radio_on_pdp_fail_regular_deactivation_bool";

    field public static final java.lang.String KEY_RTT_SUPPORTED_BOOL = "rtt_supported_bool";

    field public static final java.lang.String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

    field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";

telecomm/java/android/telecom/PhoneAccount.java

+3 −0
Original line number Diff line number Diff line
@@ -964,6 +964,9 @@ public final class PhoneAccount implements Parcelable { 
        if (hasCapabilities(CAPABILITY_SIM_SUBSCRIPTION)) {

            sb.append("SimSub ");

        }

        if (hasCapabilities(CAPABILITY_RTT)) {

            sb.append("Rtt");

        }

        return sb.toString();

    }

telephony/java/android/telephony/CarrierConfigManager.java

+6 −0
Original line number Diff line number Diff line
@@ -1654,6 +1654,11 @@ public class CarrierConfigManager { 
    public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL =

            "show_ims_registration_status_bool";



    /**

     * Flag indicating whether the carrier supports RTT over IMS.

     */

    public static final String KEY_RTT_SUPPORTED_BOOL = "rtt_supported_bool";



    /**

     * The flag to disable the popup dialog which warns the user of data charges.

     * @hide
@@ -1984,6 +1989,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_NON_ROAMING_OPERATOR_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);

        sDefaults.putBoolean(KEY_RTT_SUPPORTED_BOOL, false);

        sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);

        sDefaults.putStringArray(KEY_FEATURE_ACCESS_CODES_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_IDENTIFY_HIGH_DEFINITION_CALLS_IN_CALL_LOG_BOOL, false);