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

Commit 630c6b15 authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Add null check on subs" into qt-dev

parents d9bd0f8a aa0f655b

src/java/com/android/internal/telephony/euicc/EuiccController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1093,7 +1093,7 @@ public class EuiccController extends IEuiccController.Stub { 
    @Nullable

    @Nullable

    private SubscriptionInfo getSubscriptionForSubscriptionId(int subscriptionId) {

    private SubscriptionInfo getSubscriptionForSubscriptionId(int subscriptionId) {

        List<SubscriptionInfo> subs = mSubscriptionManager.getAvailableSubscriptionInfoList();

        List<SubscriptionInfo> subs = mSubscriptionManager.getAvailableSubscriptionInfoList();

        int subCount = subs.size();

        int subCount = (subs != null) ? subs.size() : 0;

        for (int i = 0; i < subCount; i++) {

        for (int i = 0; i < subCount; i++) {

            SubscriptionInfo sub = subs.get(i);

            SubscriptionInfo sub = subs.get(i);

            if (subscriptionId == sub.getSubscriptionId()) {

            if (subscriptionId == sub.getSubscriptionId()) {