commit d3d3161695a0480b38a02400d390c04f20ce8779
author Tom Hsu <tomhsu@google.com> Sat Jul 24 06:32:37 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 24 06:32:37 2021 +0000
tree 4ec1a15606cfee81909532bc07e593a1cdd3b69c
parent 23086519464896536dc8af36548e39c074f60b30
parent 01f43ff2909790cbb72ac6aee0952420204e9dc8

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

src/com/android/settings/network/helper/SubscriptionAnnotation.java

diff --git a/src/com/android/settings/network/helper/SubscriptionAnnotation.java b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
index fae5b9b..f6d3ccd 100644
--- a/src/com/android/settings/network/helper/SubscriptionAnnotation.java
+++ b/src/com/android/settings/network/helper/SubscriptionAnnotation.java
@@ -100,11 +100,10 @@
             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