From 2ecdcb6f21c2d354b13e12e28c372a491260768a Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Mon, 8 Apr 2019 13:32:17 -0700 Subject: [PATCH] Revert a bad merge from ag/6938423 Bug: 130174575 Test: none Change-Id: I7684f9e06f4d226010448e5520965a8733c43073 Merged-In: I7684f9e06f4d226010448e5520965a8733c43073 (cherry picked from commit 12f75864a214fd2de6968357d1d3ab7c02d0e5ae) --- .../telephony/CarrierConfigManager.java | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 6729307da4850..0f8f873b6847b 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2804,48 +2804,6 @@ public class CarrierConfigManager { "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. - * - *

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. */ private final static PersistableBundle sDefaults;