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

Commit c4b64745 authored by Youming Ye's avatar Youming Ye Committed by Gerrit Code Review
Browse files

Merge changes from topic "cherrypick" 

* changes:
  Add CarrierConfig to hide "Network default" option in Caller ID setting
  add four new carrier configs for supplementary service precautions.
parents af0de1a2 187c9943

api/current.txt

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

    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_CLIR_NETWORK_DEFAULT_BOOL = "support_clir_network_default_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";

telephony/java/android/telephony/CarrierConfigManager.java

+52 −0
Original line number Diff line number Diff line
@@ -2183,6 +2183,53 @@ public class CarrierConfigManager { 
    public static final String KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL =

            "show_call_blocking_disabled_notification_always_bool";



    /**

     * Some carriers only support SS over UT via INTERNET PDN.

     * When mobile data is OFF or data roaming OFF during roaming,

     * UI should block the call forwarding operation and notify the user

     * that the function only works if data is available.

     * @hide

     */

    public static final String KEY_CALL_FORWARDING_OVER_UT_WARNING_BOOL =

            "call_forwarding_over_ut_warning_bool";



    /**

     * Some carriers only support SS over UT via INTERNET PDN.

     * When mobile data is OFF or data roaming OFF during roaming,

     * UI should block the call barring operation and notify the user

     * that the function only works if data is available.

     * @hide

     */

    public static final String KEY_CALL_BARRING_OVER_UT_WARNING_BOOL =

            "call_barring_over_ut_warning_bool";



    /**

     * Some carriers only support SS over UT via INTERNET PDN.

     * When mobile data is OFF or data roaming OFF during roaming,

     * UI should block the caller id operation and notify the user

     * that the function only works if data is available.

     * @hide

     */

    public static final String KEY_CALLER_ID_OVER_UT_WARNING_BOOL =

            "caller_id_over_ut_warning_bool";



    /**

     * Some carriers only support SS over UT via INTERNET PDN.

     * When mobile data is OFF or data roaming OFF during roaming,

     * UI should block the call waiting operation and notify the user

     * that the function only works if data is available.

     * @hide

     */

    public static final String KEY_CALL_WAITING_OVER_UT_WARNING_BOOL =

            "call_waiting_over_ut_warning_bool";



    /**

     * Flag indicating whether to support "Network default" option in Caller ID settings for Calling

     * Line Identification Restriction (CLIR).

     */

    public static final String KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL =

            "support_clir_network_default_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -2526,6 +2573,11 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, "");

        sDefaults.putBoolean(KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_FORWARDING_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_BARRING_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_CALLER_ID_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_WAITING_OVER_UT_WARNING_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL, true);

    }



    /**