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

Commit fa6f40f3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fixed crash in subscription controller"

parents 7303122f abf11436

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

+6 −3
Original line number Diff line number Diff line
@@ -647,10 +647,13 @@ public class SubscriptionController extends ISub.Stub { 


        synchronized (mCacheActiveSubInfoList) {

            mCacheActiveSubInfoList.clear();

            mCacheActiveSubInfoList.addAll(getSubInfo(

                    SubscriptionManager.SIM_SLOT_INDEX + ">=0", null));

            List<SubscriptionInfo> activeSubscriptionInfoList = getSubInfo(

                    SubscriptionManager.SIM_SLOT_INDEX + ">=0", null);

            if (activeSubscriptionInfoList != null) {

                mCacheActiveSubInfoList.addAll(activeSubscriptionInfoList);

            }

            if (DBG_CACHE) {

                if (mCacheActiveSubInfoList != null) {

                if (!mCacheActiveSubInfoList.isEmpty()) {

                    for (SubscriptionInfo si : mCacheActiveSubInfoList) {

                        logd("[refreshCachedActiveSubscriptionInfoList] Setting Cached info="

                                + si);