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

Commit a0a95f69 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Fixed crash in subscription controller 

am: 33814154

Change-Id: Ibb5710e564dcbf66a1a56a816421365ab4854a49
parents c90d14d1 33814154

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);