Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7f6 am: c86e5802c6

Browse Source 
am: efb72ba71c

Change-Id: Ib678a10ef5d4792581c40d8ac15a183604d35ba2
This commit is contained in:
Junda Liu
2017-04-06 18:39:43 +00:00
committed by android-build-merger
parent ab98962251 efb72ba71c
commit b99d392425
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -795,6 +795,16 @@ public class CarrierConfigManager {
*/
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.
* 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_PREFERRED_NETWORK_TYPE_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.putStringArray(KEY_WFC_OPERATOR_ERROR_CODES_STRING_ARRAY, null);
sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0);