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

Commit 36a9fa62 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Emergency SMS carrier config flag"

parents 9ca4d439 ceaf7226

api/current.txt

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

    field public static final java.lang.String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final java.lang.String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";

    field public static final java.lang.String KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL = "support_emergency_sms_over_ims_bool";

    field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";

    field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";

    field public static final java.lang.String KEY_TREAT_DOWNGRADED_VIDEO_CALLS_AS_VIDEO_CALLS_BOOL = "treat_downgraded_video_calls_as_video_calls_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -113,6 +113,14 @@ public class CarrierConfigManager { 
    public static final String

            KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";



    /**

     * Flag indicating whether or not sending emergency SMS messages over IMS

     * is supported when in LTE/limited LTE (Emergency only) service mode..

     *

     */

    public static final String

            KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL = "support_emergency_sms_over_ims_bool";



    /** Flag indicating if the phone is a world phone */

    public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
@@ -1967,6 +1975,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);

        sDefaults.putBoolean(KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL, true);

        sDefaults.putBoolean(KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, false);