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

Commit 37a18425 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Fix handling for no default phone." into mnc-dr-dev

parents 62c27d50 682afe07

src/java/com/android/internal/telephony/dataconnection/DctController.java

+7 −2
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public class DctController extends Handler { 
        //2-2. If no, set data not allow on the current PS subscription

        //2-2-1. Set data allow on the selected subscription



        int requestedPhoneId = getTopPriorityRequestPhoneId();

        final int requestedPhoneId = getTopPriorityRequestPhoneId();

        int activePhoneId = INVALID_PHONE_INDEX;



        for (int i=0; i<mDcSwitchStateMachine.length; i++) {
@@ -525,7 +525,12 @@ public class DctController extends Handler { 
        } else {

            subId = Integer.parseInt(topSubId);

        }

        return mSubController.getPhoneId(subId);

        final int phoneId = mSubController.getPhoneId(subId);

        if (phoneId == DEFAULT_PHONE_INDEX) {

            // that means there isn't a phone for the default sub

            return INVALID_PHONE_INDEX;

        }

        return phoneId;

    }



    private void onSubInfoReady() {