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

Commit b869100b authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Show "Call Blocking disabled" notification always when emergency call" 

am: 6fa8bcb8

Change-Id: I14ea5a138db3b26bc043897ae0a65144bdd0a8ec
parents 2b385675 6fa8bcb8

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41989,6 +41989,7 @@ package android.telephony { 
    field public static final deprecated 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_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL = "show_call_blocking_disabled_notification_always_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";

    field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";

telephony/java/android/telephony/CarrierConfigManager.java

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

            "call_redirection_service_component_name_string";



    /**

     * Flag specifying whether to show notification(call blocking disabled) when Enhanced Call

     * Blocking(KEY_SUPPORT_ENHANCED_CALL_BLOCKING_BOOL) is enabled and making emergency call.

     * When true, notification is shown always.

     * When false, notification is shown only when any setting of "Enhanced Blocked number" is

     * enabled.

     */

    public static final String KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL =

            "show_call_blocking_disabled_notification_always_bool";



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

    private final static PersistableBundle sDefaults;
@@ -2454,6 +2464,7 @@ 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);

    }



    /**