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

Commit e77b3c20 authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Add a new api getAggregateSatellitePlmnListForCarrier 

It provides all sum of available satellite plmn list.

Bug: 316264277
Test: Manual test with pixel in live network.
Test: atest SatelliteControllerTest, SatelliteManagerTest, SatelliteManagerTestOnMockService
Change-Id: I7ef458b6d8baeb736edc310369f1fbe7c8206369
parent c200ba47

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class NtnCapabilityResolver { 
    public static void resolveNtnCapability(

            @NonNull NetworkRegistrationInfo networkRegistrationInfo, int subId) {

        SatelliteController satelliteController = SatelliteController.getInstance();

        List<String> satellitePlmnList = satelliteController.getSatellitePlmnList(subId);

        List<String> satellitePlmnList = satelliteController.getAllSatellitePlmnsForCarrier(subId);

        String registeredPlmn = networkRegistrationInfo.getRegisteredPlmn();

        for (String satellitePlmn : satellitePlmnList) {

            if (TextUtils.equals(satellitePlmn, registeredPlmn)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -2320,9 +2320,9 @@ public class SatelliteController extends Handler { 
     * @return The list of satellite PLMNs used for connecting to satellite networks.

     */

    @NonNull

    public List<String> getSatellitePlmnList(int subId) {

    public List<String> getAllSatellitePlmnsForCarrier(int subId) {

        if (!mFeatureFlags.carrierEnabledSatelliteFlag()) {

            logd("getSatellitePlmnList: carrierEnabledSatelliteFlag is disabled");

            logd("getAllSatellitePlmnsForCarrier: carrierEnabledSatelliteFlag is disabled");

            return new ArrayList<>();

        }

        synchronized (mSupportedSatelliteServicesLock) {

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -260,7 +260,8 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mSatelliteController = Mockito.mock(SatelliteController.class);

        replaceInstance(SatelliteController.class, "sInstance", null,

                mSatelliteController);

        doReturn(new ArrayList<>()).when(mSatelliteController).getSatellitePlmnList(anyInt());

        doReturn(new ArrayList<>()).when(mSatelliteController).getAllSatellitePlmnsForCarrier(

                anyInt());



        mContextFixture.putResource(R.string.kg_text_message_separator, " \u2014 ");
@@ -3386,7 +3387,8 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        CellIdentityGsm cellIdentity =

                new CellIdentityGsm(0, 1, 900, 5, "101", "23", "test", "tst",

                        Collections.emptyList());

        doReturn(Arrays.asList("10123")).when(mSatelliteController).getSatellitePlmnList(anyInt());

        doReturn(Arrays.asList("10123")).when(mSatelliteController).getAllSatellitePlmnsForCarrier(

                anyInt());

        doReturn(satelliteSupportedServiceList).when(mSatelliteController)

                .getSupportedSatelliteServices(sst.mSubId, "10123");

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

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class NtnCapabilityResolverTest extends TelephonyTest { 
        replaceInstance(SatelliteController.class, "sInstance", null,

                mMockSatelliteController);

        doReturn(Arrays.asList(SATELLITE_PLMN_ARRAY))

                .when(mMockSatelliteController).getSatellitePlmnList(anyInt());

                .when(mMockSatelliteController).getAllSatellitePlmnsForCarrier(anyInt());

        doReturn(mSatelliteSupportedServiceList).when(mMockSatelliteController)

                .getSupportedSatelliteServices(SUB_ID, SATELLITE_PLMN);

    }

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

+11 −9
Original line number Diff line number Diff line
@@ -1584,7 +1584,8 @@ public class SatelliteControllerTest extends TelephonyTest { 
    @Test

    public void testSupportedSatelliteServices() {

        when(mFeatureFlags.carrierEnabledSatelliteFlag()).thenReturn(false);

        List<String> satellitePlmnList = mSatelliteControllerUT.getSatellitePlmnList(SUB_ID);

        List<String> satellitePlmnList = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(

                SUB_ID);

        assertEquals(EMPTY_STRING_ARRAY.length, satellitePlmnList.size());

        List<Integer> supportedSatelliteServices =

                mSatelliteControllerUT.getSupportedSatelliteServices(SUB_ID, "00101");
@@ -1607,7 +1608,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        TestSatelliteController testSatelliteController =

                new TestSatelliteController(mContext, Looper.myLooper(), mFeatureFlags);



        satellitePlmnList = testSatelliteController.getSatellitePlmnList(SUB_ID);

        satellitePlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(satellitePlmnList.isEmpty());

        supportedSatelliteServices =

                testSatelliteController.getSupportedSatelliteServices(SUB_ID, "00101");
@@ -1639,7 +1640,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        }

        processAllMessages();



        satellitePlmnList = testSatelliteController.getSatellitePlmnList(SUB_ID);

        satellitePlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(Arrays.equals(

                expectedSupportedSatellitePlmns, satellitePlmnList.stream().toArray()));

        supportedSatelliteServices =
@@ -1666,7 +1667,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        }

        processAllMessages();



        satellitePlmnList = testSatelliteController.getSatellitePlmnList(SUB_ID);

        satellitePlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(satellitePlmnList.isEmpty());

        supportedSatelliteServices =

                testSatelliteController.getSupportedSatelliteServices(SUB_ID, "00102");
@@ -1711,7 +1712,8 @@ public class SatelliteControllerTest extends TelephonyTest { 
        TestSatelliteController testSatelliteController =

                new TestSatelliteController(mContext, Looper.myLooper(), mFeatureFlags);

        processAllMessages();

        List<String> carrierPlmnList = testSatelliteController.getSatellitePlmnList(SUB_ID);

        List<String> carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(

                SUB_ID);

        verify(mMockSatelliteModemInterface, never()).setSatellitePlmn(

                anyInt(), anyList(), anyList(), any(Message.class));

        assertTrue(carrierPlmnList.isEmpty());
@@ -1738,7 +1740,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
            );

        }

        processAllMessages();

        carrierPlmnList = testSatelliteController.getSatellitePlmnList(SUB_ID);

        carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        verify(mMockSatelliteModemInterface, never()).setSatellitePlmn(

                anyInt(), anyList(), anyList(), any(Message.class));

        assertTrue(carrierPlmnList.isEmpty());
@@ -1764,7 +1766,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        }

        processAllMessages();



        carrierPlmnList = testSatelliteController.getSatellitePlmnList(SUB_ID);

        carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(carrierPlmnList.isEmpty());

        List<String> allSatellitePlmnList = SatelliteServiceUtils.mergeStrLists(

                carrierPlmnList, satellitePlmnListFromOverlayConfig);
@@ -1784,7 +1786,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
            );

        }

        processAllMessages();

        carrierPlmnList = testSatelliteController.getSatellitePlmnList(SUB_ID);

        carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        allSatellitePlmnList = SatelliteServiceUtils.mergeStrLists(

                carrierPlmnList, satellitePlmnListFromOverlayConfig);

        assertEquals(expectedCarrierPlmnList, carrierPlmnList);
@@ -1823,7 +1825,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
            );

        }

        processAllMessages();

        carrierPlmnList = testSatelliteController.getSatellitePlmnList(SUB_ID);

        carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(carrierPlmnList.isEmpty());

        verify(mMockSatelliteModemInterface, times(1)).setSatellitePlmn(anyInt(),

                eq(EMPTY_STRING_LIST), eq(EMPTY_STRING_LIST), any(Message.class));