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

Commit c761571f authored by Arun kumar Voddu's avatar Arun kumar Voddu Committed by Automerger Merge Worker
Browse files

Merge "Updating mDefaultFallbackSubId cache in multiple scenarios" am: 4c151649 am: 903c2402 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2276226



Change-Id: Iffaaba1bf610bad7cdcc9f67bc21585bd4576ebc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 080174ec 903c2402

src/java/com/android/internal/telephony/SubscriptionController.java

+22 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,9 @@ public class SubscriptionController extends ISub.Stub { 
                            // Set the default sub if not set or if single sim device

                            if (!isSubscriptionForRemoteSim(subscriptionType)) {

                                if (!SubscriptionManager.isValidSubscriptionId(defaultSubId)

                                        || subIdCountMax == 1) {

                                        || subIdCountMax == 1

                                        || mDefaultFallbackSubId.get() ==

                                        SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                                    logdl("setting default fallback subid to " + subId);

                                    setDefaultFallbackSubId(subId, subscriptionType);

                                }
@@ -1714,7 +1716,26 @@ public class SubscriptionController extends ISub.Stub { 
        // Refresh the Cache of Active Subscription Info List

        refreshCachedActiveSubscriptionInfoList();



        boolean isFallBackRefreshRequired = false;

        if (mDefaultFallbackSubId.get() > SubscriptionManager.INVALID_SUBSCRIPTION_ID &&

                mSlotIndexToSubIds.getCopy(slotIndex) != null &&

                mSlotIndexToSubIds.getCopy(slotIndex).contains(mDefaultFallbackSubId.get())) {

            isFallBackRefreshRequired = true;

        }

        mSlotIndexToSubIds.remove(slotIndex);

        // set mDefaultFallbackSubId to invalid in case mSlotIndexToSubIds do not have any entries

        if (mSlotIndexToSubIds.size() ==0 ) {

            mDefaultFallbackSubId.set(SubscriptionManager.INVALID_SUBSCRIPTION_ID);

        } else if (isFallBackRefreshRequired) {

            // set mDefaultFallbackSubId to valid subId from mSlotIndexToSubIds

            for (int index = 0; index < getActiveSubIdArrayList().size(); index ++) {

                int subId = getActiveSubIdArrayList().get(index);

                if (subId > SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                    mDefaultFallbackSubId.set(subId);

                    break;

                }

            }

        }

    }



    /**