Merge "Add the carrier config for cdma less carrier" (e80a5cce) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8901,6 +8901,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void overrideConfig(int, @Nullable android.os.PersistableBundle);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void updateConfigForPhoneId(int, String);
		field public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string";
		field public static final String KEY_SUPPORT_CDMA_1X_VOICE_CALLS_BOOL = "support_cdma_1x_voice_calls_bool";
		}

		public final class CarrierRestrictionRules implements android.os.Parcelable {

+9 −0

Original line number	Diff line number	Diff line
		@@ -1855,6 +1855,14 @@ public class CarrierConfigManager {
		*/
		public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

		/**
		* Determines whether 1X voice calls is supported for some CDMA carriers.
		* Default value is true.
		* @hide
		*/
		@SystemApi
		public static final String KEY_SUPPORT_CDMA_1X_VOICE_CALLS_BOOL =
		"support_cdma_1x_voice_calls_bool";

		/**
		* Boolean indicating if support is provided for directly dialing FDN number from FDN list.
		@@ -3622,6 +3630,7 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);
		sDefaults.putInt(
		KEY_CDMA_ROAMING_MODE_INT, TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT);
		sDefaults.putBoolean(KEY_SUPPORT_CDMA_1X_VOICE_CALLS_BOOL, true);
		sDefaults.putString(KEY_RCS_CONFIG_SERVER_URL_STRING, "");

		// Carrier Signalling Receivers