Merge "Revert a bad merge from ag/6938423" into qt-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
039a58dffb
@@ -2804,48 +2804,6 @@ public class CarrierConfigManager {
|
|||||||
"key_is_opportunistic_subscription_bool";
|
"key_is_opportunistic_subscription_bool";
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user