Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695 am: 4f3957614f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364

Change-Id: Ied4c7301c8387cd220603dd52226303ebba7c06f
This commit is contained in:
Tom Hsu
2021-07-24 06:53:39 +00:00
committed by Automerger Merge Worker

View File

@@ -100,11 +100,10 @@ public class SubscriptionAnnotation {
return;
}
mIsExisted = simSlotIndex.contains(mSubInfo.getSimSlotIndex());
mIsActive = activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
if (mIsExisted) {
mIsAllowToDisplay = isDisplayAllowed(context);
}
mIsExisted = true;
mIsActive = (mSubInfo.getSimSlotIndex() > SubscriptionManager.INVALID_SIM_SLOT_INDEX)
&& activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());
mIsAllowToDisplay = isDisplayAllowed(context);
}
// the index provided during construction of Builder