PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up SubscriptionInfoEntity unused fields" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-07-12 05:17:46 +00:00
committed by Android (Google) Code Review
parent bbd5d8885e cd4cf67422
commit 3ba331528c
5 changed files with 51 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/network/MobileNetworkRepository.java
View File

@@ -474,30 +474,16 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
return null;
} else {
getUiccInfoBySubscriptionInfo(uiccSlotInfos, subInfo);
SubscriptionInfo firstRemovableSubInfo = SubscriptionUtil.getFirstRemovableSubscription(
context);
if (DEBUG) {
Log.d(TAG, "convert subscriptionInfo to entity for subId = " + subId);
}
return new SubscriptionInfoEntity(String.valueOf(subId),
subInfo.getSimSlotIndex(),
subInfo.getCarrierId(), subInfo.getDisplayName().toString(),
subInfo.getCarrierName() != null ? subInfo.getCarrierName().toString() : "",
subInfo.getDataRoaming(), subInfo.getMccString(), subInfo.getMncString(),
subInfo.getCountryIso(), subInfo.isEmbedded(), mCardId,
subInfo.getPortIndex(), subInfo.isOpportunistic(),
String.valueOf(subInfo.getGroupUuid()),
subInfo.getSubscriptionType(),
return new SubscriptionInfoEntity(String.valueOf(subId), subInfo.getSimSlotIndex(),
subInfo.isEmbedded(), subInfo.isOpportunistic(),
SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, context).toString(),
SubscriptionUtil.isSubscriptionVisible(mSubscriptionManager, context, subInfo),
SubscriptionUtil.getFormattedPhoneNumber(context, subInfo),
firstRemovableSubInfo == null ? false
: firstRemovableSubInfo.getSubscriptionId() == subId,
SubscriptionUtil.isDefaultSubscription(context, subId),
mSubscriptionManager.isValidSubscriptionId(subId),
mSubscriptionManager.isUsableSubscriptionId(subId),
mSubscriptionManager.isActiveSubscriptionId(subId),
true /*availableSubInfo*/,
mSubscriptionManager.getActiveDataSubscriptionId() == subId);
}
}