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

Commit 474e64b2 authored by Jeff Davidson's avatar Jeff Davidson Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in EuiccController." into oc-dr1-dev

parents ce3e7ebc 27590b41

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

+3 −0
Original line number Diff line number Diff line
@@ -906,6 +906,9 @@ public class EuiccController extends IEuiccController.Stub { 
    private boolean canManageActiveSubscription(String callingPackage) {

        // TODO(b/36260308): We should plumb a slot ID through here for multi-SIM devices.

        List<SubscriptionInfo> subInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();

        if (subInfoList == null) {

            return false;

        }

        int size = subInfoList.size();

        for (int subIndex = 0; subIndex < size; subIndex++) {

            SubscriptionInfo subInfo = subInfoList.get(subIndex);