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

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

Merge "Handle exception in getSimStateForSlotIndex." 

am: 1e90d0d0

Change-Id: I0fcd63765895723dab2592a0303884556c8e7fef
parents 498a3a40 1e90d0d0

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

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

            err = "invalid slotIndex";

        } else {

            Phone phone = PhoneFactory.getPhone(slotIndex);

            Phone phone = null;

            try {

                phone = PhoneFactory.getPhone(slotIndex);

            } catch (IllegalStateException e) {

                // ignore

            }

            if (phone == null) {

                simState = IccCardConstants.State.UNKNOWN;

                err = "phone == null";