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

Commit 27590b41 authored by Jeff Davidson's avatar Jeff Davidson
Browse files

Fix NPE in EuiccController. 

getActiveSubscriptionInfoList() can return null - don't crash in this
case.

Change-Id: I160561f2240f02d1136964f59a694cfe3bff18c1
Test: TreeHugger / local verification
Fixes: 62493915
parent 1c8373b0

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