Merge "Opportunistic Sub Grouping Keys in CarrierConfig" into qt-dev am: 8cadcf07fa (716edaad) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+44 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2762,6 +2762,48 @@ public class CarrierConfigManager {
	public static final String KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION =		public static final String KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION =
	"carrier_auto_cancel_cs_notification";		"carrier_auto_cancel_cs_notification";

			/**
			* Passing this value as {@link KEY_SUBSCRIPTION_GROUP_UUID_STRING} will remove the
			* subscription from a group instead of adding it to a group.
			*
			* TODO: Expose in a future release.
			*
			* @hide
			*/
			public static final String REMOVE_GROUP_UUID_STRING = "00000000-0000-0000-0000-000000000000";

			/**
			* The UUID of a Group of related subscriptions in which to place the current subscription.
			*
			* A grouped subscription will behave for billing purposes and other UI purposes as though it
			* is a transparent extension of other subscriptions in the group.
			*
			* <p>If set to {@link #REMOVE_GROUP_UUID_STRING}, then the subscription will be removed from
			* its current group.
			*
			* TODO: unhide this key.
			*
			* @hide
			*/
			public static final String KEY_SUBSCRIPTION_GROUP_UUID_STRING =
			"key_subscription_group_uuid_string";

			/**
			* A boolean property indicating whether this subscription should be managed as an opportunistic
			* subscription.
			*
			* If true, then this subscription will be selected based on available coverage and will not be
			* available for a user in settings menus for selecting macro network providers. If unset,
			* defaults to “false”.
			*
			* TODO: unhide this key.
			*
			* @hide
			*/
			public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL =
			"key_is_opportunistic_subscription_bool";


	/** The default value for every variable. */		/** The default value for every variable. */
	private final static PersistableBundle sDefaults;		private final static PersistableBundle sDefaults;

	@@ -3160,6 +3202,8 @@ public class CarrierConfigManager {
	sDefaults.putString(KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING, "");		sDefaults.putString(KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING, "");
	sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,		sDefaults.putBoolean(KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN,
	false);		false);
			sDefaults.putString(KEY_SUBSCRIPTION_GROUP_UUID_STRING, "");
			sDefaults.putBoolean(KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL, false);
	}		}

	/**		/**