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

Commit 83371443 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, NetworkSelectSettingsTest
Change-Id: Idb6439176be55a787f27f298c211deef6900c7f9
parent fd58065c

src/com/android/settings/network/telephony/NetworkSelectSettings.java

+5 −5
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ public class NetworkSelectSettings extends DashboardFragment { 
       cellular network. Therefore, it is needed to filter out satellite plmns from current cell

       info list  */

    private List<CellInfo> filterOutSatellitePlmn(List<CellInfo> cellInfoList) {

        List<String> aggregatedSatellitePlmn = getAllSatellitePlmnsForCarrierWrapper();

        List<String> aggregatedSatellitePlmn = getSatellitePlmnsForCarrierWrapper();

        if (!mShouldFilterOutSatellitePlmn.get() || aggregatedSatellitePlmn.isEmpty()) {

            return cellInfoList;

        }
@@ -431,13 +431,13 @@ public class NetworkSelectSettings extends DashboardFragment { 
    }



    /**

     * Serves as a wrapper method for {@link SatelliteManager#getAllSatellitePlmnsForCarrier(int)}.

     * Serves as a wrapper method for {@link SatelliteManager#getSatellitePlmnsForCarrier(int)}.

     * Since SatelliteManager is final, this wrapper enables mocking or spying of

     * {@link SatelliteManager#getAllSatellitePlmnsForCarrier(int)} for unit testing purposes.

     * {@link SatelliteManager#getSatellitePlmnsForCarrier(int)} for unit testing purposes.

     */

    @VisibleForTesting

    protected List<String> getAllSatellitePlmnsForCarrierWrapper() {

        return mSatelliteManager.getAllSatellitePlmnsForCarrier(mSubId);

    protected List<String> getSatellitePlmnsForCarrierWrapper() {

        return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);

    }



    private void handleCarrierConfigChanged(int subId) {

tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java

+4 −4
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ public class NetworkSelectSettingsTest { 


        List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));

        doReturn(testSatellitePlmn).when(

                mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper();

                mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();



        /* Expect filter out satellite plmns when

           KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL is true, and there is available
@@ -318,13 +318,13 @@ public class NetworkSelectSettingsTest { 


        List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));

        doReturn(testSatellitePlmn).when(

                mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper();

                mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();



        // Expect no filter out when there is no available satellite plmns.

        mNetworkSelectSettings.onCreateInitialization();

        testSatellitePlmn = new ArrayList<>();

        doReturn(testSatellitePlmn).when(

                mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper();

                mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();

        mNetworkSelectSettings.onCreateInitialization();

        List<CellInfo> testList = Arrays.asList(

                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
@@ -356,7 +356,7 @@ public class NetworkSelectSettingsTest { 


        List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));

        doReturn(testSatellitePlmn).when(

                mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper();

                mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();



        // Expect no filter out when KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL is false.

        config.putBoolean(