diff options
3 files changed, 4 insertions, 229 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/DataServiceUtils.java b/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/DataServiceUtils.java index 8868837e4cff..4028b73a2c71 100644 --- a/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/DataServiceUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/DataServiceUtils.java @@ -105,12 +105,6 @@ public class DataServiceUtils { public static final String COLUMN_CARD_STATE = "cardState"; /** - * The name of the extended APDU supported state column, see - * {@link UiccSlotInfo#getIsExtendedApduSupported()}. - */ - public static final String COLUMN_IS_EXTENDED_APDU_SUPPORTED = "isExtendedApduSupported"; - - /** * The name of the removable state column, see {@link UiccSlotInfo#isRemovable()}. */ public static final String COLUMN_IS_REMOVABLE = "isRemovable"; @@ -150,74 +144,17 @@ public class DataServiceUtils { public static final String COLUMN_SIM_SLOT_INDEX = "simSlotIndex"; /** - * The name of the carrier ID column, see {@link SubscriptionInfo#getCarrierId()}. - */ - public static final String COLUMN_CARRIER_ID = "carrierId"; - - /** - * The name of the display name column, see {@link SubscriptionInfo#getDisplayName()}. - */ - public static final String COLUMN_DISPLAY_NAME = "displayName"; - - /** - * The name of the carrier name column, see {@link SubscriptionInfo#getCarrierName()}. - */ - public static final String COLUMN_CARRIER_NAME = "carrierName"; - - /** - * The name of the data roaming state column, see - * {@link SubscriptionInfo#getDataRoaming()}. - */ - public static final String COLUMN_DATA_ROAMING = "dataRoaming"; - - /** - * The name of the mcc column, see {@link SubscriptionInfo#getMccString()}. - */ - public static final String COLUMN_MCC = "mcc"; - - /** - * The name of the mnc column, see {@link SubscriptionInfo#getMncString()}. - */ - public static final String COLUMN_MNC = "mnc"; - - /** - * The name of the country ISO column, see {@link SubscriptionInfo#getCountryIso()}. - */ - public static final String COLUMN_COUNTRY_ISO = "countryIso"; - - /** * The name of the embedded state column, see {@link SubscriptionInfo#isEmbedded()}. */ public static final String COLUMN_IS_EMBEDDED = "isEmbedded"; /** - * The name of the card ID column, see {@link SubscriptionInfo#getCardId()}. - */ - public static final String COLUMN_CARD_ID = "cardId"; - - /** - * The name of the port index column, see {@link SubscriptionInfo#getPortIndex()}. - */ - public static final String COLUMN_PORT_INDEX = "portIndex"; - - /** * The name of the opportunistic state column, see * {@link SubscriptionInfo#isOpportunistic()}. */ public static final String COLUMN_IS_OPPORTUNISTIC = "isOpportunistic"; /** - * The name of the groupUUID column, see {@link SubscriptionInfo#getGroupUuid()}. - */ - public static final String COLUMN_GROUP_UUID = "groupUUID"; - - /** - * The name of the subscription type column, see - * {@link SubscriptionInfo#getSubscriptionType()}}. - */ - public static final String COLUMN_SUBSCRIPTION_TYPE = "subscriptionType"; - - /** * The name of the uniqueName column, * {@see SubscriptionUtil#getUniqueSubscriptionDisplayName(SubscriptionInfo, Context)}. */ @@ -231,19 +168,6 @@ public class DataServiceUtils { public static final String COLUMN_IS_SUBSCRIPTION_VISIBLE = "isSubscriptionVisible"; /** - * The name of the formatted phone number column, - * {@see SubscriptionUtil#getFormattedPhoneNumber(Context, SubscriptionInfo)}. - */ - public static final String COLUMN_FORMATTED_PHONE_NUMBER = "getFormattedPhoneNumber"; - - /** - * The name of the first removable subscription state column, - * {@see SubscriptionUtil#getFirstRemovableSubscription(Context)}. - */ - public static final String COLUMN_IS_FIRST_REMOVABLE_SUBSCRIPTION = - "isFirstRemovableSubscription"; - - /** * The name of the default subscription selection column, * {@see SubscriptionUtil#getSubscriptionOrDefault(Context, int)}. */ @@ -257,24 +181,12 @@ public class DataServiceUtils { public static final String COLUMN_IS_VALID_SUBSCRIPTION = "isValidSubscription"; /** - * The name of the usable subscription column, - * {@link SubscriptionManager#isUsableSubscriptionId(int)}. - */ - public static final String COLUMN_IS_USABLE_SUBSCRIPTION = "isUsableSubscription"; - - /** * The name of the active subscription column, * {@link SubscriptionManager#isActiveSubscriptionId(int)}. */ public static final String COLUMN_IS_ACTIVE_SUBSCRIPTION_ID = "isActiveSubscription"; /** - * The name of the available subscription column, - * {@see SubscriptionUtil#getAvailableSubscription(Context, ProxySubscriptionManager, int)}. - */ - public static final String COLUMN_IS_AVAILABLE_SUBSCRIPTION = "isAvailableSubscription"; - - /** * The name of the active data subscription state column, see * {@link SubscriptionManager#getActiveDataSubscriptionId()}. */ diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoDao.java b/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoDao.java index e6b1cfb440fa..060eab6681c6 100644 --- a/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoDao.java +++ b/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoDao.java @@ -40,15 +40,6 @@ public interface SubscriptionInfoDao { + DataServiceUtils.SubscriptionInfoData.COLUMN_ID + " = :subId") SubscriptionInfoEntity querySubInfoById(String subId); - @Query("SELECT * FROM " + DataServiceUtils.SubscriptionInfoData.TABLE_NAME + " WHERE " - + DataServiceUtils.SubscriptionInfoData.COLUMN_IS_ACTIVE_SUBSCRIPTION_ID - + " = :isActiveSubscription" + " AND " - + DataServiceUtils.SubscriptionInfoData.COLUMN_IS_SUBSCRIPTION_VISIBLE - + " = :isSubscriptionVisible" + " ORDER BY " - + DataServiceUtils.SubscriptionInfoData.COLUMN_SIM_SLOT_INDEX) - LiveData<List<SubscriptionInfoEntity>> queryActiveSubInfos( - boolean isActiveSubscription, boolean isSubscriptionVisible); - @Query("SELECT COUNT(*) FROM " + DataServiceUtils.SubscriptionInfoData.TABLE_NAME) int count(); diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoEntity.java b/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoEntity.java index 361a24612b3a..88e6a57bf45b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoEntity.java +++ b/packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoEntity.java @@ -19,7 +19,6 @@ package com.android.settingslib.mobile.dataservice; import android.text.TextUtils; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.room.ColumnInfo; import androidx.room.Entity; import androidx.room.PrimaryKey; @@ -28,39 +27,19 @@ import java.util.Objects; @Entity(tableName = DataServiceUtils.SubscriptionInfoData.TABLE_NAME) public class SubscriptionInfoEntity { - public SubscriptionInfoEntity(@NonNull String subId, int simSlotIndex, int carrierId, - String displayName, String carrierName, int dataRoaming, String mcc, String mnc, - String countryIso, boolean isEmbedded, int cardId, int portIndex, - boolean isOpportunistic, @Nullable String groupUUID, int subscriptionType, - String uniqueName, boolean isSubscriptionVisible, @Nullable String formattedPhoneNumber, - boolean isFirstRemovableSubscription, boolean isDefaultSubscriptionSelection, - boolean isValidSubscription, boolean isUsableSubscription, - boolean isActiveSubscriptionId, boolean isAvailableSubscription, - boolean isActiveDataSubscriptionId) { + public SubscriptionInfoEntity(@NonNull String subId, int simSlotIndex, boolean isEmbedded, + boolean isOpportunistic, String uniqueName, boolean isSubscriptionVisible, + boolean isDefaultSubscriptionSelection, boolean isValidSubscription, + boolean isActiveSubscriptionId, boolean isActiveDataSubscriptionId) { this.subId = subId; this.simSlotIndex = simSlotIndex; - this.carrierId = carrierId; - this.displayName = displayName; - this.carrierName = carrierName; - this.dataRoaming = dataRoaming; - this.mcc = mcc; - this.mnc = mnc; - this.countryIso = countryIso; this.isEmbedded = isEmbedded; - this.cardId = cardId; - this.portIndex = portIndex; this.isOpportunistic = isOpportunistic; - this.groupUUID = groupUUID; - this.subscriptionType = subscriptionType; this.uniqueName = uniqueName; this.isSubscriptionVisible = isSubscriptionVisible; - this.formattedPhoneNumber = formattedPhoneNumber; - this.isFirstRemovableSubscription = isFirstRemovableSubscription; this.isDefaultSubscriptionSelection = isDefaultSubscriptionSelection; this.isValidSubscription = isValidSubscription; - this.isUsableSubscription = isUsableSubscription; this.isActiveSubscriptionId = isActiveSubscriptionId; - this.isAvailableSubscription = isAvailableSubscription; this.isActiveDataSubscriptionId = isActiveDataSubscriptionId; } @@ -72,59 +51,18 @@ public class SubscriptionInfoEntity { @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_SIM_SLOT_INDEX) public int simSlotIndex; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_CARRIER_ID) - public int carrierId; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_DISPLAY_NAME) - public String displayName; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_CARRIER_NAME) - public String carrierName; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_DATA_ROAMING) - public int dataRoaming; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_MCC) - public String mcc; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_MNC) - public String mnc; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_COUNTRY_ISO) - public String countryIso; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_EMBEDDED) public boolean isEmbedded; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_CARD_ID) - public int cardId; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_PORT_INDEX) - public int portIndex; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_OPPORTUNISTIC) public boolean isOpportunistic; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_GROUP_UUID) - @Nullable - public String groupUUID; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_SUBSCRIPTION_TYPE) - public int subscriptionType; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_UNIQUE_NAME) public String uniqueName; @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_SUBSCRIPTION_VISIBLE) public boolean isSubscriptionVisible; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_FORMATTED_PHONE_NUMBER) - @Nullable - public String formattedPhoneNumber; - - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_FIRST_REMOVABLE_SUBSCRIPTION) - public boolean isFirstRemovableSubscription; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_DEFAULT_SUBSCRIPTION_SELECTION) public boolean isDefaultSubscriptionSelection; @@ -132,15 +70,9 @@ public class SubscriptionInfoEntity { @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_VALID_SUBSCRIPTION) public boolean isValidSubscription; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_USABLE_SUBSCRIPTION) - public boolean isUsableSubscription; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_ACTIVE_SUBSCRIPTION_ID) public boolean isActiveSubscriptionId; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_AVAILABLE_SUBSCRIPTION) - public boolean isAvailableSubscription; - @ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_ACTIVE_DATA_SUBSCRIPTION) public boolean isActiveDataSubscriptionId; @@ -165,28 +97,13 @@ public class SubscriptionInfoEntity { return Objects.hash( subId, simSlotIndex, - carrierId, - displayName, - carrierName, - dataRoaming, - mcc, - mnc, - countryIso, isEmbedded, - cardId, - portIndex, isOpportunistic, - groupUUID, - subscriptionType, uniqueName, isSubscriptionVisible, - formattedPhoneNumber, - isFirstRemovableSubscription, isDefaultSubscriptionSelection, isValidSubscription, - isUsableSubscription, isActiveSubscriptionId, - isAvailableSubscription, isActiveDataSubscriptionId); } @@ -202,28 +119,13 @@ public class SubscriptionInfoEntity { SubscriptionInfoEntity info = (SubscriptionInfoEntity) obj; return TextUtils.equals(subId, info.subId) && simSlotIndex == info.simSlotIndex - && carrierId == info.carrierId - && TextUtils.equals(displayName, info.displayName) - && TextUtils.equals(carrierName, info.carrierName) - && dataRoaming == info.dataRoaming - && TextUtils.equals(mcc, info.mcc) - && TextUtils.equals(mnc, info.mnc) - && TextUtils.equals(countryIso, info.countryIso) && isEmbedded == info.isEmbedded - && cardId == info.cardId - && portIndex == info.portIndex && isOpportunistic == info.isOpportunistic - && TextUtils.equals(groupUUID, info.groupUUID) - && subscriptionType == info.subscriptionType && TextUtils.equals(uniqueName, info.uniqueName) && isSubscriptionVisible == info.isSubscriptionVisible - && TextUtils.equals(formattedPhoneNumber, info.formattedPhoneNumber) - && isFirstRemovableSubscription == info.isFirstRemovableSubscription && isDefaultSubscriptionSelection == info.isDefaultSubscriptionSelection && isValidSubscription == info.isValidSubscription - && isUsableSubscription == info.isUsableSubscription && isActiveSubscriptionId == info.isActiveSubscriptionId - && isAvailableSubscription == info.isAvailableSubscription && isActiveDataSubscriptionId == info.isActiveDataSubscriptionId; } @@ -233,50 +135,20 @@ public class SubscriptionInfoEntity { .append(subId) .append(", simSlotIndex = ") .append(simSlotIndex) - .append(", carrierId = ") - .append(carrierId) - .append(", displayName = ") - .append(displayName) - .append(", carrierName = ") - .append(carrierName) - .append(", dataRoaming = ") - .append(dataRoaming) - .append(", mcc = ") - .append(mcc) - .append(", mnc = ") - .append(mnc) - .append(", countryIso = ") - .append(countryIso) .append(", isEmbedded = ") .append(isEmbedded) - .append(", cardId = ") - .append(cardId) - .append(", portIndex = ") - .append(portIndex) .append(", isOpportunistic = ") .append(isOpportunistic) - .append(", groupUUID = ") - .append(groupUUID) - .append(", subscriptionType = ") - .append(subscriptionType) .append(", uniqueName = ") .append(uniqueName) .append(", isSubscriptionVisible = ") .append(isSubscriptionVisible) - .append(", formattedPhoneNumber = ") - .append(formattedPhoneNumber) - .append(", isFirstRemovableSubscription = ") - .append(isFirstRemovableSubscription) .append(", isDefaultSubscriptionSelection = ") .append(isDefaultSubscriptionSelection) .append(", isValidSubscription = ") .append(isValidSubscription) - .append(", isUsableSubscription = ") - .append(isUsableSubscription) .append(", isActiveSubscriptionId = ") .append(isActiveSubscriptionId) - .append(", isAvailableSubscription = ") - .append(isAvailableSubscription) .append(", isActiveDataSubscriptionId = ") .append(isActiveDataSubscriptionId) .append(")}"); |