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

Commit 7fbcf9d9 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Smart Forwarding] Enable package/class entry in PARIS"

parents be40054b 612e6a94

telephony/java/android/telephony/CarrierConfigManager.java

+17 −0
Original line number Original line Diff line number Diff line
@@ -2570,6 +2570,22 @@ public class CarrierConfigManager { 
    public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY =

    public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY =

            "emergency_number_prefix_string_array";

            "emergency_number_prefix_string_array";





    /**

     * Smart forwarding config. Smart forwarding is a feature to configure call forwarding to a

     * different SIM in the device when one SIM is not reachable. The config here specifies a smart

     * forwarding component that will launch UI for changing the configuration. An empty string

     * indicates that no smart forwarding component is specified.

     *

     * Currently, only one non-empty configuration of smart forwarding component within system will

     * be used when multiple SIMs are inserted.

     *

     * Empty string by default.

     *

     * @hide

     */

    public static final String KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING =

            "smart_forwarding_config_component_name_string";



    /**

    /**

     * Indicates when a carrier has a primary subscription and an opportunistic subscription active,

     * Indicates when a carrier has a primary subscription and an opportunistic subscription active,

     * and when Internet data is switched to opportunistic network, whether to still show

     * and when Internet data is switched to opportunistic network, whether to still show
@@ -3130,6 +3146,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);

        sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, true);

        sDefaults.putBoolean(KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, true);

        sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);

        sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);

        sDefaults.putString(KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING, "");

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,

                false);

                false);

    }

    }