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

Commit f9a1528e authored by Junda Liu's avatar Junda Liu Committed by android-build-merger
Browse files

Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7... 

Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7 am: c86e5802 am: efb72ba7
am: b99d3924

Change-Id: I57b1a18ab684aaad2bd26dbf30bc591b2cddfa8f
parents edfa656e b99d3924

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -795,6 +795,16 @@ public class CarrierConfigManager { 
     */

     */

    public static final String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool";

    public static final String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool";





    /**

     * String array for package names that need to be enabled for this carrier.

     * If user has explicitly disabled some packages in the list, won't re-enable.

     * Other carrier specific apps which are not in this list may be disabled for current carrier,

     * and only be re-enabled when this config for another carrier includes it.

     *

     * @hide

     */

    public static final String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";



    /**

    /**

     * Determine whether user can switch Wi-Fi preferred or Cellular preferred in calling preference.

     * Determine whether user can switch Wi-Fi preferred or Cellular preferred in calling preference.

     * Some operators support Wi-Fi Calling only, not VoLTE.

     * Some operators support Wi-Fi Calling only, not VoLTE.
@@ -1549,6 +1559,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL, false);

        sDefaults.putStringArray(KEY_ENABLE_APPS_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_EDITABLE_WFC_MODE_BOOL, true);

        sDefaults.putBoolean(KEY_EDITABLE_WFC_MODE_BOOL, true);

        sDefaults.putStringArray(KEY_WFC_OPERATOR_ERROR_CODES_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_WFC_OPERATOR_ERROR_CODES_STRING_ARRAY, null);

        sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0);

        sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0);