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

Commit d800f9a2 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Jayachandran C
Browse files

Remove carrier roaming eligibility check for satellite mode 

Once we are in satellite mode there is no need to check for satellite eligibility. Also elgibility check is specifically for SMS that would break eSOS

Bug: 378165106
Change-Id: Iff8bd5a3ccc353baa39e809b1233b7433c644382
Flag: EXEMPT bugfix
Test: System Test
parent c813e78c

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

+15 −4
Original line number Diff line number Diff line
@@ -3930,14 +3930,25 @@ public class SatelliteController extends Handler { 
            return false;

        }



        if (!isCarrierRoamingNtnEligible(phone)) {

            plogd("isInCarrierRoamingNbIotNtn: phone associated with subId "

                      + phone.getSubId()

                      + " is not carrier roaming ntn eligible.");

        if (phone == null) {

            plogd("isInCarrierRoamingNbIotNtn: phone is null");

            return false;

        }



        int subId = phone.getSubId();

        if (!isSatelliteSupportedViaCarrier(subId)) {

            plogd("isInCarrierRoamingNbIotNtn[phoneId=" + phone.getPhoneId()

                    + "]: satellite is not supported via carrier");

            return false;

        }



        int carrierRoamingNtnConnectType = getCarrierRoamingNtnConnectType(subId);

        if (carrierRoamingNtnConnectType != CARRIER_ROAMING_NTN_CONNECT_MANUAL) {

            plogd("isInCarrierRoamingNbIotNtn[phoneId=" + phone.getPhoneId() + "]: not manual "

                    + "connect. carrierRoamingNtnConnectType = " + carrierRoamingNtnConnectType);

            return false;

        }



        if (subId != getSelectedSatelliteSubId()) {

            plogd("isInCarrierRoamingNbIotNtn: subId=" + subId

                    + " does not match satellite subId=" + getSelectedSatelliteSubId());