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

Commit 26b7b332 authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Remove unnecessary term 'all' from the API name 

getAllSatellitePlmnsForCarrier > getSatellitePlmnsForCarrier
The word 'all' is unnecessary here, it's already implied by PLMN being a plural.

Bug: 320462244
Test: atest SatelliteManagerTet, SatelliteManagerTestOnMockService, SatelliteControllerTest, NtnCapabilityResolverTest, ServiceStateTrackerTest
Change-Id: I0168c2c0385aac3afe7334e8caa0afdbed8e875d
parent d4c8e083

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.getAllSatellitePlmnsForCarrier(subId);

        List<String> satellitePlmnList = satelliteController.getSatellitePlmnsForCarrier(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
@@ -2342,9 +2342,9 @@ public class SatelliteController extends Handler { 
     * @return The list of satellite PLMNs used for connecting to satellite networks.

     */

    @NonNull

    public List<String> getAllSatellitePlmnsForCarrier(int subId) {

    public List<String> getSatellitePlmnsForCarrier(int subId) {

        if (!mFeatureFlags.carrierEnabledSatelliteFlag()) {

            logd("getAllSatellitePlmnsForCarrier: carrierEnabledSatelliteFlag is disabled");

            logd("getSatellitePlmnsForCarrier: carrierEnabledSatelliteFlag is disabled");

            return new ArrayList<>();

        }

        synchronized (mSupportedSatelliteServicesLock) {

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

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

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

                mSatelliteController);

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

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

                anyInt());



        mContextFixture.putResource(R.string.kg_text_message_separator, " \u2014 ");
@@ -3387,7 +3387,7 @@ 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).getAllSatellitePlmnsForCarrier(

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

                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).getAllSatellitePlmnsForCarrier(anyInt());

                .when(mMockSatelliteController).getSatellitePlmnsForCarrier(anyInt());

        doReturn(mSatelliteSupportedServiceList).when(mMockSatelliteController)

                .getSupportedSatelliteServices(SUB_ID, SATELLITE_PLMN);

    }

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

+16 −16
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
    @Test

    public void testSupportedSatelliteServices() {

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

        List<String> satellitePlmnList = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(

        List<String> satellitePlmnList = mSatelliteControllerUT.getSatellitePlmnsForCarrier(

                SUB_ID);

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

        List<Integer> supportedSatelliteServices =
@@ -1682,7 +1682,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        TestSatelliteController testSatelliteController =

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



        satellitePlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        satellitePlmnList = testSatelliteController.getSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(satellitePlmnList.isEmpty());

        supportedSatelliteServices =

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

        processAllMessages();



        satellitePlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        satellitePlmnList = testSatelliteController.getSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(Arrays.equals(

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

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

        processAllMessages();



        satellitePlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        satellitePlmnList = testSatelliteController.getSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(satellitePlmnList.isEmpty());

        supportedSatelliteServices =

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

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

        processAllMessages();

        List<String> carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(

        List<String> carrierPlmnList = testSatelliteController.getSatellitePlmnsForCarrier(

                SUB_ID);

        verify(mMockSatelliteModemInterface, never()).setSatellitePlmn(

                anyInt(), anyList(), anyList(), any(Message.class));
@@ -1814,7 +1814,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
            );

        }

        processAllMessages();

        carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        carrierPlmnList = testSatelliteController.getSatellitePlmnsForCarrier(SUB_ID);

        verify(mMockSatelliteModemInterface, never()).setSatellitePlmn(

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

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

        processAllMessages();



        carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        carrierPlmnList = testSatelliteController.getSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(carrierPlmnList.isEmpty());

        List<String> allSatellitePlmnList = SatelliteServiceUtils.mergeStrLists(

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

        }

        processAllMessages();

        carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        carrierPlmnList = testSatelliteController.getSatellitePlmnsForCarrier(SUB_ID);

        allSatellitePlmnList = SatelliteServiceUtils.mergeStrLists(

                carrierPlmnList, satellitePlmnListFromOverlayConfig);

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

        }

        processAllMessages();

        carrierPlmnList = testSatelliteController.getAllSatellitePlmnsForCarrier(SUB_ID);

        carrierPlmnList = testSatelliteController.getSatellitePlmnsForCarrier(SUB_ID);

        assertTrue(carrierPlmnList.isEmpty());

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

                eq(EMPTY_STRING_LIST), eq(EMPTY_STRING_LIST), any(Message.class));
@@ -2683,7 +2683,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        mSatelliteControllerUT.onSatelliteEntitlementStatusUpdated(SUB_ID, false,

                entitlementPlmnList, mIIntegerConsumer);



        List<String> plmnListPerCarrier = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(

        List<String> plmnListPerCarrier = mSatelliteControllerUT.getSatellitePlmnsForCarrier(

                SUB_ID);

        List<String> allSatellitePlmnList = SatelliteServiceUtils.mergeStrLists(

                plmnListPerCarrier, overlayConfigPlmnList);
@@ -2704,7 +2704,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        mSatelliteControllerUT.onSatelliteEntitlementStatusUpdated(SUB_ID, true,

                entitlementPlmnList, mIIntegerConsumer);



        plmnListPerCarrier = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(SUB_ID);

        plmnListPerCarrier = mSatelliteControllerUT.getSatellitePlmnsForCarrier(SUB_ID);

        allSatellitePlmnList = SatelliteServiceUtils.mergeStrLists(

                plmnListPerCarrier, overlayConfigPlmnList);
@@ -2733,7 +2733,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        mSatelliteControllerUT.onSatelliteEntitlementStatusUpdated(SUB_ID, true,

                entitlementPlmnList, mIIntegerConsumer);



        plmnListPerCarrier = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(SUB_ID);

        plmnListPerCarrier = mSatelliteControllerUT.getSatellitePlmnsForCarrier(SUB_ID);

        allSatellitePlmnList = SatelliteServiceUtils.mergeStrLists(

                plmnListPerCarrier, overlayConfigPlmnList);
@@ -2767,7 +2767,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        }

        processAllMessages();



        List<String> plmnListPerCarrier = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(

        List<String> plmnListPerCarrier = mSatelliteControllerUT.getSatellitePlmnsForCarrier(

                SUB_ID);

        assertEquals(new ArrayList<>(), plmnListPerCarrier);
@@ -2785,7 +2785,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        }

        processAllMessages();



        plmnListPerCarrier = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(SUB_ID);

        plmnListPerCarrier = mSatelliteControllerUT.getSatellitePlmnsForCarrier(SUB_ID);

        assertEquals(expectedPlmnListPerCarrier, plmnListPerCarrier);



        // If the carrier config list is exists and the entitlement plmn list is empty, verify
@@ -2815,7 +2815,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        processAllMessages();



        expectedPlmnListPerCarrier = carrierConfigPlmnList;

        plmnListPerCarrier = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(SUB_ID);

        plmnListPerCarrier = mSatelliteControllerUT.getSatellitePlmnsForCarrier(SUB_ID);

        assertEquals(expectedPlmnListPerCarrier.stream().sorted().toList(),

                plmnListPerCarrier.stream().sorted().toList());
@@ -2833,7 +2833,7 @@ public class SatelliteControllerTest extends TelephonyTest { 
        processAllMessages();



        expectedPlmnListPerCarrier = entitlementPlmnList;

        plmnListPerCarrier = mSatelliteControllerUT.getAllSatellitePlmnsForCarrier(

        plmnListPerCarrier = mSatelliteControllerUT.getSatellitePlmnsForCarrier(

                SUB_ID);

        assertEquals(expectedPlmnListPerCarrier.stream().sorted().toList(),

                plmnListPerCarrier.stream().sorted().toList());