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

Commit f3c922b6 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-b27082e439c548f5839254a467a6bb58" 

* changes:
  Merge "Show "Call Blocking disabled" notification always when emergency call" am: 6fa8bcb8 am: b869100b am: a86151a9
  Merge "Show "Call Blocking disabled" notification always when emergency call" am: 6fa8bcb8 am: b9f2d0a5
  Show "Call Blocking disabled" notification always when emergency call am: 638d11e0 am: db6110d9
parents 734395e2 c97ed07a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42270,6 +42270,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
@@ -2115,6 +2115,16 @@ public class CarrierConfigManager { 
    public static final String KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL =

            "config_show_orig_dial_string_for_cdma";



    /**

     * 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;
@@ -2453,6 +2463,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);

    }



    /**