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

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

Merge "Stay in satellite mode when device found Limited Service." into main

parents 3cfa7316 3d744c2e

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

+1 −1
Original line number Diff line number Diff line
@@ -6123,7 +6123,7 @@ public class SatelliteController extends Handler { 
                        AccessNetworkConstants.TRANSPORT_TYPE_WWAN);



        for (NetworkRegistrationInfo nri : nriList) {

            if (nri.isInService() || nri.isEmergencyEnabled()) {

            if (nri.isInService()) {

                logv("getWwanIsInService: return true");

                return true;

            }

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+0 −8
Original line number Diff line number Diff line
@@ -4195,14 +4195,6 @@ public class SatelliteControllerTest extends TelephonyTest { 
                .thenReturn(List.of(nri));

        assertTrue(mSatelliteControllerUT.getWwanIsInService(mServiceState));



        nri = new NetworkRegistrationInfo.Builder()

                .setEmergencyOnly(true)

                .build();

        when(mServiceState.getNetworkRegistrationInfoListForTransportType(

                eq(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)))

                .thenReturn(List.of(nri));

        assertTrue(mSatelliteControllerUT.getWwanIsInService(mServiceState));



        nri = new NetworkRegistrationInfo.Builder().setRegistrationState(

                        NetworkRegistrationInfo.REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING)

                .build();