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

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

Change-Id: I2ed737674321b7f923952562f0f1c82a38fca4af
This commit is contained in:
Tom Hsu
2021-07-24 06:41:27 +00:00
committed by Automerger Merge Worker

View File

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