diff options
| author | Jordan Liu <jminjie@google.com> | 2017-11-28 21:40:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-28 21:40:01 +0000 |
| commit | dc98d6e44b3e477ca6a97859a6be5fb610093161 (patch) | |
| tree | 391355321b685158feb0b4869da089793f07418f | |
| parent | 24cd7cbd1e3086f4d4ffdea76bde4fa638180110 (diff) | |
| parent | 0385e3a547d8e8a9ef33035e06f31a965b09c00e (diff) | |
Merge "Add carrier config variable to hide manage IMS conference call button"
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 1d081119ffd3..0b58e7614ad7 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -779,6 +779,14 @@ public class CarrierConfigManager { public static final String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int"; /** + * Determines whether manage IMS conference calls is supported by a carrier. When {@code true}, + * manage IMS conference call is supported, {@code false otherwise}. + * @hide + */ + public static final String KEY_SUPPORT_MANAGE_IMS_CONFERENCE_CALL_BOOL = + "support_manage_ims_conference_call_bool"; + + /** * Determines whether High Definition audio property is displayed in the dialer UI. * If {@code false}, remove the HD audio property from the connection so that HD audio related * UI is not displayed. If {@code true}, keep HD audio property as it is configured. @@ -1782,6 +1790,7 @@ public class CarrierConfigManager { sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0); sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true); + sDefaults.putBoolean(KEY_SUPPORT_MANAGE_IMS_CONFERENCE_CALL_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL, false); sDefaults.putBoolean(KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL, false); sDefaults.putInt(KEY_IMS_CONFERENCE_SIZE_LIMIT_INT, 5); |