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

Commit f05bf2aa authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add carrier config to show wifi calling icon in status bar" into rvc-dev am: 4a758b47 

Change-Id: I44a81cc4cf46aca238d897addbe771d4cb3ac2c8
parents 73bdcc2a 4a758b47

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -3031,6 +3031,13 @@ public class CarrierConfigManager { 
    public static final String KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL =

    public static final String KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL =

            "ascii_7_bit_support_for_long_message_bool";

            "ascii_7_bit_support_for_long_message_bool";





    /**

     * Controls whether to show wifi calling icon in statusbar when wifi calling is available.

     * @hide

     */

    public static final String KEY_SHOW_WIFI_CALLING_ICON_IN_STATUS_BAR_BOOL =

            "show_wifi_calling_icon_in_status_bar_bool";



    /**

    /**

     * Controls RSRP threshold at which OpportunisticNetworkService will decide whether

     * Controls RSRP threshold at which OpportunisticNetworkService will decide whether

     * the opportunistic network is good enough for internet data.

     * the opportunistic network is good enough for internet data.
@@ -4022,6 +4029,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_SUB6_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_SUB6_BOOL, false);

        sDefaults.putBoolean(KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL, false);

        sDefaults.putBoolean(KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_WIFI_CALLING_ICON_IN_STATUS_BAR_BOOL, false);

        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */

        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */

        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT, -108);

        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT, -108);

        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_MODERATE */

        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_MODERATE */