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

Commit dfb2ad07 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Handle exception in getSimStateForSlotIndex." into qt-dev am: 24704884 

am: 6afdd50a

Change-Id: Ifef300c4546af1411e3c9807be300b292d11ed06
parents d6729b9f 6afdd50a

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -2399,7 +2399,12 @@ public class SubscriptionController extends ISub.Stub { 
            simState = IccCardConstants.State.UNKNOWN;

            simState = IccCardConstants.State.UNKNOWN;

            err = "invalid slotIndex";

            err = "invalid slotIndex";

        } else {

        } else {

            Phone phone = PhoneFactory.getPhone(slotIndex);

            Phone phone = null;

            try {

                phone = PhoneFactory.getPhone(slotIndex);

            } catch (IllegalStateException e) {

                // ignore

            }

            if (phone == null) {

            if (phone == null) {

                simState = IccCardConstants.State.UNKNOWN;

                simState = IccCardConstants.State.UNKNOWN;

                err = "phone == null";

                err = "phone == null";