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

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

Fixed crash in subscription controller am: 33814154 

am: a0a95f69

Change-Id: I8016699b7dddd462ddf341a15addc56139ababb9
parents 7c764e8a a0a95f69

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