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

Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am: d99aade6e2

Browse Source 
am: d91b1f6bb8

* commit 'd91b1f6bb84c22b9b20df2537500bf23f6b65ad2':
  Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
This commit is contained in:
Pavel Zhamaitsiak
2015-10-21 00:39:56 +00:00
committed by android-build-merger
parent a153a8072c d91b1f6bb8
commit 2c26344cee
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,6 +267,13 @@ public class CarrierConfigManager {
public static final String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL
= "carrier_allow_turnoff_ims_bool";
/**
* Flag specifying whether Generic Bootstrapping Architecture capable SIM is required for IMS.
* @hide
*/
public static final String KEY_CARRIER_IMS_GBA_REQUIRED_BOOL
= "carrier_ims_gba_required_bool";
/**
* Flag specifying whether IMS instant lettering is available for the carrier. {@code True} if
* instant lettering is available for the carrier, {@code false} otherwise.
@@ -503,6 +510,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_IMS_GBA_REQUIRED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);
sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");
sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING, "");