Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" into qt-qpr1-dev (f275d96b) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2866,7 +2866,6 @@ public class CarrierConfigManager {
	/**		/**
	* Location information during (and after) an emergency call is only provided over control		* Location information during (and after) an emergency call is only provided over control
	* plane signaling from the network.		* plane signaling from the network.
	* @hide
	*/		*/
	public static final int SUPL_EMERGENCY_MODE_TYPE_CP_ONLY = 0;		public static final int SUPL_EMERGENCY_MODE_TYPE_CP_ONLY = 0;

	@@ -2874,7 +2873,6 @@ public class CarrierConfigManager {
	* Location information during (and after) an emergency call is provided over the data		* Location information during (and after) an emergency call is provided over the data
	* plane and serviced by the framework GNSS service, but if it fails, the carrier also		* plane and serviced by the framework GNSS service, but if it fails, the carrier also
	* supports control plane backup signaling.		* supports control plane backup signaling.
	* @hide
	*/		*/
	public static final int SUPL_EMERGENCY_MODE_TYPE_CP_FALLBACK = 1;		public static final int SUPL_EMERGENCY_MODE_TYPE_CP_FALLBACK = 1;

	@@ -2882,7 +2880,6 @@ public class CarrierConfigManager {
	* Location information during (and after) an emergency call is provided over the data plane		* Location information during (and after) an emergency call is provided over the data plane
	* and serviced by the framework GNSS service only. There is no backup signalling over the		* and serviced by the framework GNSS service only. There is no backup signalling over the
	* control plane if it fails.		* control plane if it fails.
	* @hide
	*/		*/
	public static final int SUPL_EMERGENCY_MODE_TYPE_DP_ONLY = 2;		public static final int SUPL_EMERGENCY_MODE_TYPE_DP_ONLY = 2;

	@@ -2990,11 +2987,21 @@ public class CarrierConfigManager {
	* {@link #SUPL_EMERGENCY_MODE_TYPE_CP_ONLY}.		* {@link #SUPL_EMERGENCY_MODE_TYPE_CP_ONLY}.
	* <p>		* <p>
	* The default value for this configuration is {@link #SUPL_EMERGENCY_MODE_TYPE_CP_ONLY}.		* The default value for this configuration is {@link #SUPL_EMERGENCY_MODE_TYPE_CP_ONLY}.
	* @hide
	*/		*/
	public static final String KEY_ES_SUPL_CONTROL_PLANE_SUPPORT_INT = KEY_PREFIX		public static final String KEY_ES_SUPL_CONTROL_PLANE_SUPPORT_INT = KEY_PREFIX
	+ "es_supl_control_plane_support_int";		+ "es_supl_control_plane_support_int";

			/**
			* A list of roaming PLMNs where SUPL ES mode does not support a control-plane mechanism to
			* get a user's location in the event that data plane SUPL fails or is otherwise
			* unavailable.
			* <p>
			* A string array of PLMNs that do not support a control-plane mechanism for getting a
			* user's location for SUPL ES.
			*/
			public static final String KEY_ES_SUPL_DATA_PLANE_ONLY_ROAMING_PLMN_STRING_ARRAY =
			KEY_PREFIX + "es_supl_data_plane_only_roaming_plmn_string_array";

	private static PersistableBundle getDefaults() {		private static PersistableBundle getDefaults() {
	PersistableBundle defaults = new PersistableBundle();		PersistableBundle defaults = new PersistableBundle();
	defaults.putBoolean(KEY_PERSIST_LPP_MODE_BOOL, true);		defaults.putBoolean(KEY_PERSIST_LPP_MODE_BOOL, true);
	@@ -3011,6 +3018,7 @@ public class CarrierConfigManager {
	defaults.putString(KEY_NFW_PROXY_APPS_STRING, "");		defaults.putString(KEY_NFW_PROXY_APPS_STRING, "");
	defaults.putInt(KEY_ES_SUPL_CONTROL_PLANE_SUPPORT_INT,		defaults.putInt(KEY_ES_SUPL_CONTROL_PLANE_SUPPORT_INT,
	SUPL_EMERGENCY_MODE_TYPE_CP_ONLY);		SUPL_EMERGENCY_MODE_TYPE_CP_ONLY);
			defaults.putStringArray(KEY_ES_SUPL_DATA_PLANE_ONLY_ROAMING_PLMN_STRING_ARRAY, null);
	return defaults;		return defaults;
	}		}
	}		}