am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev (51e8df2e) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -349,6 +349,13 @@ public class CarrierConfigManager {
		*/
		public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int";

		/**
		* Determines whether conference calls are supported by a carrier. When {@code true},
		* conference calling is supported, {@code false otherwise}.
		* @hide
		*/
		public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";

		/**
		* If this is true, the SIM card (through Customer Service Profile EF file) will be able to
		* prevent manual operator selection. If false, this SIM setting will be ignored and manual
		@@ -448,6 +455,7 @@ public class CarrierConfigManager {
		sDefaults.putStringArray(KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY, null);
		sDefaults.putBoolean(KEY_FORCE_HOME_NETWORK_BOOL, false);
		sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);
		sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

		// MMS defaults
		sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);