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

Commit 1e90d0d0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Handle exception in getSimStateForSlotIndex."

parents ccebe7ab 5632c669

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