Merge "Add a new carrier config to show the WFC location privacy policy UI" am: 4c508d1b03 (516b07ee) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2523,6 +2523,14 @@ public class CarrierConfigManager {
	public static final String KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY =		public static final String KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY =
	"cdma_enhanced_roaming_indicator_for_home_network_int_array";		"cdma_enhanced_roaming_indicator_for_home_network_int_array";

			/**
			* Determines whether wifi calling location privacy policy is shown.
			*
			* @hide
			*/
			public static final String KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL =
			"show_wfc_location_privacy_policy_bool";

	/**		/**
	* This configuration allow the system UI to display different 5G icon for different 5G status.		* This configuration allow the system UI to display different 5G icon for different 5G status.
	*		*
	@@ -2938,6 +2946,7 @@ public class CarrierConfigManager {
	1 /* Roaming Indicator Off */		1 /* Roaming Indicator Off */
	});		});
	sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]);		sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]);
			sDefaults.putBoolean(KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, true);
	sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,		sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,
	"connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");		"connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");
	sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);		sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);