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

Commit c813e78c authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Return false if radio is off in isCarrierRoamingNtnEligible" into main

parents 96355514 8ecdb4af

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+6 −1
Original line number Diff line number Diff line
@@ -4292,7 +4292,7 @@ public class SatelliteController extends Handler { 
        RequestSatelliteEnabledArgument argument =

                (RequestSatelliteEnabledArgument) request.argument;

        handlePersistentLoggingOnSessionStart(argument);

        selectBindingSatelliteSubscription(true);

        selectBindingSatelliteSubscription(argument.enableSatellite);

        SatelliteModemEnableRequestAttributes enableRequestAttributes =

                    createModemEnableRequest(argument);

        if (enableRequestAttributes == null) {
@@ -7147,6 +7147,11 @@ public class SatelliteController extends Handler { 
            return false;

        }



        if (!mIsRadioOn) {

            plogd("isCarrierRoamingNtnEligible: radio is off");

            return false;

        }



        if (phone == null) {

            plogd("isCarrierRoamingNtnEligible: phone is null");

            return false;