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

2021-07-24 06:32:37 +00:00
parent 2308651946 01f43ff290
commit d3d3161695
1 changed files with 4 additions and 5 deletions
--- a/src/com/android/settings/network/helper/SubscriptionAnnotation.java
+++ b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
@@ -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