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

Commit 5ea2f810 authored by Wink Saville's avatar Wink Saville Committed by Gerrit Code Review
Browse files

Merge "Fix NPE in SubscriptionController if getActiveSubscriptionInfoList is... 

Merge "Fix NPE in SubscriptionController if getActiveSubscriptionInfoList is empty." into lmp-mr1-dev
parents 434fa420 fecec7d7

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

+20 −10
Original line number Diff line number Diff line
@@ -446,13 +446,18 @@ public class SubscriptionController extends ISub.Stub { 
        enforceSubscriptionPermission();



        List<SubscriptionInfo> subList = getActiveSubscriptionInfoList();

        if (subList != null) {

            for (SubscriptionInfo si : subList) {

                if (si.getSubscriptionId() == subId) {

                    if (DBG) logd("[getActiveSubInfoForSubscriber]+ subId=" + subId + " subInfo=" + si);

                    return si;

                }

            }

        if (DBG) logd("[getActiveSubInfoForSubscriber]+ subId=" + subId + " subInfo=null");

        }

        if (DBG) {

            logd("[getActiveSubInfoForSubscriber]- subId=" + subId

                    + " subList=" + subList + " subInfo=null");

        }

        return null;

    }
@@ -466,13 +471,18 @@ public class SubscriptionController extends ISub.Stub { 
        enforceSubscriptionPermission();



        List<SubscriptionInfo> subList = getActiveSubscriptionInfoList();

        if (subList != null) {

            for (SubscriptionInfo si : subList) {

                if (si.getIccId() == iccId) {

                    if (DBG) logd("[getActiveSubInfoUsingIccId]+ iccId=" + iccId + " subInfo=" + si);

                    return si;

                }

            }

        if (DBG) logd("[getActiveSubInfoUsingIccId]+ iccId=" + iccId + " subInfo=null");

        }

        if (DBG) {

            logd("[getActiveSubInfoUsingIccId]+ iccId=" + iccId

                    + " subList=" + subList + " subInfo=null");

        }

        return null;

    }