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

This commit is contained in:
Tom Hsu
2021-07-24 06:32:37 +00:00
committed by Android (Google) Code Review

View File

@@ -100,11 +100,10 @@ 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