Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[SettingsLib] Remove the column which is related to intent receiver" into udc-dev

Browse Source
This commit is contained in:
Zoey Chen
2023-03-29 09:39:33 +00:00
committed by Android (Google) Code Review
parent 92ad02c41e aa7de6e482
commit 81ec1ac664
2 changed files with 4 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/DataServiceUtils.java
View File

@@ -311,12 +311,6 @@ public class DataServiceUtils {
public static final String COLUMN_IS_FIRST_REMOVABLE_SUBSCRIPTION =
"isFirstRemovableSubscription";
/**
* The name of the default SIM config column,
* {@see SubscriptionUtil#getDefaultSimConfig(Context, int)}.
*/
public static final String COLUMN_DEFAULT_SIM_CONFIG = "defaultSimConfig";
/**
* The name of the default subscription selection column,
* {@see SubscriptionUtil#getSubscriptionOrDefault(Context, int)}.
@@ -348,32 +342,6 @@ public class DataServiceUtils {
*/
public static final String COLUMN_IS_AVAILABLE_SUBSCRIPTION = "isAvailableSubscription";
/**
* The name of the default voice subscription state column, see
* {@link SubscriptionManager#getDefaultVoiceSubscriptionId()}.
*/
public static final String COLUMN_IS_DEFAULT_VOICE_SUBSCRIPTION =
"isDefaultVoiceSubscription";
/**
* The name of the default sms subscription state column, see
* {@link SubscriptionManager#getDefaultSmsSubscriptionId()}.
*/
public static final String COLUMN_IS_DEFAULT_SMS_SUBSCRIPTION = "isDefaultSmsSubscription";
/**
* The name of the default data subscription state column, see
* {@link SubscriptionManager#getDefaultDataSubscriptionId()}.
*/
public static final String COLUMN_IS_DEFAULT_DATA_SUBSCRIPTION =
"isDefaultDataSubscription";
/**
* The name of the default subscription state column, see
* {@link SubscriptionManager#getDefaultSubscriptionId()}.
*/
public static final String COLUMN_IS_DEFAULT_SUBSCRIPTION = "isDefaultSubscription";
/**
* The name of the active data subscription state column, see
* {@link SubscriptionManager#getActiveDataSubscriptionId()}.

50
packages/SettingsLib/src/com/android/settingslib/mobile/dataservice/SubscriptionInfoEntity.java
View File

@@ -37,12 +37,10 @@ public class SubscriptionInfoEntity {
String countryIso, boolean isEmbedded, int cardId, int portIndex,
boolean isOpportunistic, @Nullable String groupUUID, int subscriptionType,
String uniqueName, boolean isSubscriptionVisible, String formattedPhoneNumber,
boolean isFirstRemovableSubscription, String defaultSimConfig,
boolean isDefaultSubscriptionSelection, boolean isValidSubscription,
boolean isUsableSubscription, boolean isActiveSubscriptionId,
boolean isAvailableSubscription, boolean isDefaultVoiceSubscription,
boolean isDefaultSmsSubscription, boolean isDefaultDataSubscription,
boolean isDefaultSubscription, boolean isActiveDataSubscriptionId) {
boolean isFirstRemovableSubscription, boolean isDefaultSubscriptionSelection,
boolean isValidSubscription, boolean isUsableSubscription,
boolean isActiveSubscriptionId, boolean isAvailableSubscription,
boolean isActiveDataSubscriptionId) {
this.subId = subId;
this.simSlotIndex = simSlotIndex;
this.carrierId = carrierId;
@@ -62,16 +60,11 @@ public class SubscriptionInfoEntity {
this.isSubscriptionVisible = isSubscriptionVisible;
this.formattedPhoneNumber = formattedPhoneNumber;
this.isFirstRemovableSubscription = isFirstRemovableSubscription;
this.defaultSimConfig = defaultSimConfig;
this.isDefaultSubscriptionSelection = isDefaultSubscriptionSelection;
this.isValidSubscription = isValidSubscription;
this.isUsableSubscription = isUsableSubscription;
this.isActiveSubscriptionId = isActiveSubscriptionId;
this.isAvailableSubscription = isAvailableSubscription;
this.isDefaultVoiceSubscription = isDefaultVoiceSubscription;
this.isDefaultSmsSubscription = isDefaultSmsSubscription;
this.isDefaultDataSubscription = isDefaultDataSubscription;
this.isDefaultSubscription = isDefaultSubscription;
this.isActiveDataSubscriptionId = isActiveDataSubscriptionId;
}
@@ -135,9 +128,6 @@ public class SubscriptionInfoEntity {
@ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_FIRST_REMOVABLE_SUBSCRIPTION)
public boolean isFirstRemovableSubscription;
@ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_DEFAULT_SIM_CONFIG)
public String defaultSimConfig;
@ColumnInfo(name =
DataServiceUtils.SubscriptionInfoData.COLUMN_IS_DEFAULT_SUBSCRIPTION_SELECTION)
public boolean isDefaultSubscriptionSelection;
@@ -154,18 +144,6 @@ public class SubscriptionInfoEntity {
@ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_AVAILABLE_SUBSCRIPTION)
public boolean isAvailableSubscription;
@ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_DEFAULT_VOICE_SUBSCRIPTION)
public boolean isDefaultVoiceSubscription;
@ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_DEFAULT_SMS_SUBSCRIPTION)
public boolean isDefaultSmsSubscription;
@ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_DEFAULT_DATA_SUBSCRIPTION)
public boolean isDefaultDataSubscription;
@ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_DEFAULT_SUBSCRIPTION)
public boolean isDefaultSubscription;
@ColumnInfo(name = DataServiceUtils.SubscriptionInfoData.COLUMN_IS_ACTIVE_DATA_SUBSCRIPTION)
public boolean isActiveDataSubscriptionId;
@@ -207,16 +185,11 @@ public class SubscriptionInfoEntity {
result = 31 * result + Boolean.hashCode(isSubscriptionVisible);
result = 31 * result + formattedPhoneNumber.hashCode();
result = 31 * result + Boolean.hashCode(isFirstRemovableSubscription);
result = 31 * result + defaultSimConfig.hashCode();
result = 31 * result + Boolean.hashCode(isDefaultSubscriptionSelection);
result = 31 * result + Boolean.hashCode(isValidSubscription);
result = 31 * result + Boolean.hashCode(isUsableSubscription);
result = 31 * result + Boolean.hashCode(isActiveSubscriptionId);
result = 31 * result + Boolean.hashCode(isAvailableSubscription);
result = 31 * result + Boolean.hashCode(isDefaultVoiceSubscription);
result = 31 * result + Boolean.hashCode(isDefaultSmsSubscription);
result = 31 * result + Boolean.hashCode(isDefaultDataSubscription);
result = 31 * result + Boolean.hashCode(isDefaultSubscription);
result = 31 * result + Boolean.hashCode(isActiveDataSubscriptionId);
return result;
}
@@ -250,16 +223,11 @@ public class SubscriptionInfoEntity {
&& isSubscriptionVisible == info.isSubscriptionVisible
&& TextUtils.equals(formattedPhoneNumber, info.formattedPhoneNumber)
&& isFirstRemovableSubscription == info.isFirstRemovableSubscription
&& TextUtils.equals(defaultSimConfig, info.defaultSimConfig)
&& isDefaultSubscriptionSelection == info.isDefaultSubscriptionSelection
&& isValidSubscription == info.isValidSubscription
&& isUsableSubscription == info.isUsableSubscription
&& isActiveSubscriptionId == info.isActiveSubscriptionId
&& isAvailableSubscription == info.isAvailableSubscription
&& isDefaultVoiceSubscription == info.isDefaultVoiceSubscription
&& isDefaultSmsSubscription == info.isDefaultSmsSubscription
&& isDefaultDataSubscription == info.isDefaultDataSubscription
&& isDefaultSubscription == info.isDefaultSubscription
&& isActiveDataSubscriptionId == info.isActiveDataSubscriptionId;
}
@@ -303,8 +271,6 @@ public class SubscriptionInfoEntity {
.append(formattedPhoneNumber)
.append(", isFirstRemovableSubscription = ")
.append(isFirstRemovableSubscription)
.append(", defaultSimConfig = ")
.append(defaultSimConfig)
.append(", isDefaultSubscriptionSelection = ")
.append(isDefaultSubscriptionSelection)
.append(", isValidSubscription = ")
@@ -315,14 +281,6 @@ public class SubscriptionInfoEntity {
.append(isActiveSubscriptionId)
.append(", isAvailableSubscription = ")
.append(isAvailableSubscription)
.append(", isDefaultVoiceSubscription = ")
.append(isDefaultVoiceSubscription)
.append(", isDefaultSmsSubscription = ")
.append(isDefaultSmsSubscription)
.append(", isDefaultDataSubscription = ")
.append(isDefaultDataSubscription)
.append(", isDefaultSubscription = ")
.append(isDefaultSubscription)
.append(", isActiveDataSubscriptionId = ")
.append(isActiveDataSubscriptionId)
.append(")}");