Merge "Only make a subset of Call Barring options visible per carrier" into pi-dev (18ee2674) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,28 @@ public class CarrierConfigManager {
		public static final String KEY_CALL_BARRING_VISIBILITY_BOOL =
		"call_barring_visibility_bool";

		/**
		* Flag indicating whether or not changing the call barring password via the "Call Barring"
		* settings menu is supported. If true, the option will be visible in the "Call
		* Barring" settings menu. If false, the option will not be visible.
		*
		* Enabled by default.
		* @hide
		*/
		public static final String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL =
		"call_barring_supports_password_change_bool";

		/**
		* Flag indicating whether or not deactivating all call barring features via the "Call Barring"
		* settings menu is supported. If true, the option will be visible in the "Call
		* Barring" settings menu. If false, the option will not be visible.
		*
		* Enabled by default.
		* @hide
		*/
		public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL =
		"call_barring_supports_deactivate_all_bool";

		/**
		* Flag indicating whether the Phone app should ignore EVENT_SIM_NETWORK_LOCKED
		* events from the Sim.
		@@ -2095,6 +2117,8 @@ public class CarrierConfigManager {

		sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false);
		sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false);
		sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL, true);
		sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL, true);
		sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true);
		sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL, true);
		sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL, true);