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

Merge "Clean up UiccInfoEntity unused fields" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-07-18 08:44:19 +00:00
committed by Android (Google) Code Review
parent 028dd20d96 0ffd546f2f
commit 9503f42efb
1 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,6 @@ import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyCallback; import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.telephony.UiccCardInfo;
import android.telephony.UiccPortInfo; import android.telephony.UiccPortInfo;
import android.telephony.UiccSlotInfo; import android.telephony.UiccSlotInfo;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -86,12 +85,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
private AirplaneModeObserver mAirplaneModeObserver; private AirplaneModeObserver mAirplaneModeObserver;
private MetricsFeatureProvider mMetricsFeatureProvider; private MetricsFeatureProvider mMetricsFeatureProvider;
private int mPhysicalSlotIndex = SubscriptionManager.INVALID_SIM_SLOT_INDEX; private int mPhysicalSlotIndex = SubscriptionManager.INVALID_SIM_SLOT_INDEX;
private int mLogicalSlotIndex = SubscriptionManager.INVALID_SIM_SLOT_INDEX;
private int mCardState = UiccSlotInfo.CARD_STATE_INFO_ABSENT;
private int mPortIndex = TelephonyManager.INVALID_PORT_INDEX;
private int mCardId = TelephonyManager.UNINITIALIZED_CARD_ID;
private boolean mIsEuicc = false;
private boolean mIsRemovable = false;
private boolean mIsActive = false; private boolean mIsActive = false;
private Map<Integer, SubscriptionInfo> mSubscriptionInfoMap = new ArrayMap<>(); private Map<Integer, SubscriptionInfo> mSubscriptionInfoMap = new ArrayMap<>();
private Map<Integer, TelephonyManager> mTelephonyManagerMap = new HashMap<>(); private Map<Integer, TelephonyManager> mTelephonyManagerMap = new HashMap<>();
@@ -301,19 +294,13 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
UiccSlotInfo curSlotInfo = uiccSlotInfos[i]; UiccSlotInfo curSlotInfo = uiccSlotInfos[i];
if (curSlotInfo != null && curSlotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT) { if (curSlotInfo != null && curSlotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT) {
final int index = i; final int index = i;
mIsEuicc = curSlotInfo.getIsEuicc();
mCardState = curSlotInfo.getCardStateInfo();
mIsRemovable = curSlotInfo.isRemovable();
mCardId = subInfo.getCardId();
Collection<UiccPortInfo> uiccPortInfos = curSlotInfo.getPorts(); Collection<UiccPortInfo> uiccPortInfos = curSlotInfo.getPorts();
uiccPortInfos.forEach(portInfo -> { uiccPortInfos.forEach(portInfo -> {
if (portInfo.getPortIndex() == subInfo.getPortIndex() if (portInfo.getPortIndex() == subInfo.getPortIndex()
&& portInfo.getLogicalSlotIndex() == subInfo.getSimSlotIndex()) { && portInfo.getLogicalSlotIndex() == subInfo.getSimSlotIndex()) {
mPhysicalSlotIndex = index; mPhysicalSlotIndex = index;
mLogicalSlotIndex = portInfo.getLogicalSlotIndex();
mIsActive = portInfo.isActive(); mIsActive = portInfo.isActive();
mPortIndex = portInfo.getPortIndex();
} else if (DEBUG) { } else if (DEBUG) {
Log.d(TAG, "Can not get port index and physicalSlotIndex for subId " Log.d(TAG, "Can not get port index and physicalSlotIndex for subId "
+ subInfo.getSubscriptionId()); + subInfo.getSubscriptionId());
@@ -433,7 +420,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
mMobileNetworkDatabase.insertSubsInfo(subInfoEntity); mMobileNetworkDatabase.insertSubsInfo(subInfoEntity);
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_SUB_INFO, subId); SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_SUB_INFO, subId);
insertUiccInfo(subId, telephonyManager); insertUiccInfo(subId);
insertMobileNetworkInfo(subId, telephonyManager); insertMobileNetworkInfo(subId, telephonyManager);
} }
} else if (DEBUG) { } else if (DEBUG) {
@@ -488,8 +475,8 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
} }
} }
private void insertUiccInfo(int subId, TelephonyManager telephonyManager) { private void insertUiccInfo(int subId) {
UiccInfoEntity uiccInfoEntity = convertToUiccInfoEntity(subId, telephonyManager); UiccInfoEntity uiccInfoEntity = convertToUiccInfoEntity(subId);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "uiccInfoEntity = " + uiccInfoEntity); Log.d(TAG, "uiccInfoEntity = " + uiccInfoEntity);
} }
@@ -532,27 +519,8 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions
); );
} }
private UiccInfoEntity convertToUiccInfoEntity(int subId, TelephonyManager telephonyManager) { private UiccInfoEntity convertToUiccInfoEntity(int subId) {
return new UiccInfoEntity(String.valueOf(subId), String.valueOf(mPhysicalSlotIndex), return new UiccInfoEntity(String.valueOf(subId), mIsActive);
mLogicalSlotIndex, mCardId, mIsEuicc,
isMultipleEnabledProfilesSupported(telephonyManager), mCardState, mIsRemovable,
mIsActive, mPortIndex
);
}
private boolean isMultipleEnabledProfilesSupported(TelephonyManager telephonyManager) {
if (telephonyManager == null) {
Log.d(TAG, "TelephonyManager is null");
return false;
}
List<UiccCardInfo> cardInfos = telephonyManager.getUiccCardsInfo();
if (cardInfos == null) {
Log.d(TAG, "UICC card info list is empty.");
return false;
}
return cardInfos.stream().anyMatch(
cardInfo -> cardInfo.isMultipleEnabledProfilesSupported());
} }
@Override @Override