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

Merge "Add new key for carrier configuration version"

Browse Source 
am: 06dcff96e4

Change-Id: Iaea4aa1e677385cbc1051ec9910bbc85d1c1e944
This commit is contained in:
Jordan Liu
2018-12-10 12:44:48 -08:00
committed by android-build-merger
parent f1f26e1165 06dcff96e4
commit a39793b22f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,15 @@ public class CarrierConfigManager {
// give it a default value in sDefaults. If you need to ship a per-network override in the
// system image, that can be added in packages/apps/CarrierConfig.
/**
* Specifies a value that identifies the version of the carrier configuration that is
* currently in use. This string is displayed on the UI.
* The format of the string is not specified.
* @hide
*/
public static final String KEY_CARRIER_CONFIG_VERSION_STRING =
"carrier_config_version_string";
/**
* This flag specifies whether VoLTE availability is based on provisioning. By default this is
* false.
@@ -2328,6 +2337,7 @@ public class CarrierConfigManager {
static {
sDefaults = new PersistableBundle();
sDefaults.putString(KEY_CARRIER_CONFIG_VERSION_STRING, "");
sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL, false);
sDefaults.putBoolean(KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL, false);