Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10af4a87 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info."... 

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

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

Change-Id: Ie33f9ae9cb7dfe13562b67010a8b56cf8941a288
parents dfd6de3b d3d31616

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

+4 −5
Original line number Diff line number Diff line
@@ -100,12 +100,11 @@ public class SubscriptionAnnotation { 
            return;

        }



        mIsExisted = simSlotIndex.contains(mSubInfo.getSimSlotIndex());

        mIsActive = activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());

        if (mIsExisted) {

        mIsExisted = true;

        mIsActive = (mSubInfo.getSimSlotIndex() > SubscriptionManager.INVALID_SIM_SLOT_INDEX)

            && activeSimSlotIndexList.contains(mSubInfo.getSimSlotIndex());

        mIsAllowToDisplay = isDisplayAllowed(context);

    }

    }



    // the index provided during construction of Builder

    @Keep