PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary term 'all' from the API name

Browse Source 
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
This commit is contained in:
Hakjun Choi
2024-01-19 08:36:20 +00:00
parent fd58065cdb
commit 833714434a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -420,7 +420,7 @@ public class NetworkSelectSettings extends DashboardFragment {
cellular network. Therefore, it is needed to filter out satellite plmns from current cell cellular network. Therefore, it is needed to filter out satellite plmns from current cell
info list */ info list */
private List<CellInfo> filterOutSatellitePlmn(List<CellInfo> cellInfoList) { private List<CellInfo> filterOutSatellitePlmn(List<CellInfo> cellInfoList) {
List<String> aggregatedSatellitePlmn = getAllSatellitePlmnsForCarrierWrapper(); List<String> aggregatedSatellitePlmn = getSatellitePlmnsForCarrierWrapper();
if (!mShouldFilterOutSatellitePlmn.get() || aggregatedSatellitePlmn.isEmpty()) { if (!mShouldFilterOutSatellitePlmn.get() || aggregatedSatellitePlmn.isEmpty()) {
return cellInfoList; 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 * 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 @VisibleForTesting
protected List<String> getAllSatellitePlmnsForCarrierWrapper() { protected List<String> getSatellitePlmnsForCarrierWrapper() {
return mSatelliteManager.getAllSatellitePlmnsForCarrier(mSubId); return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);
} }
private void handleCarrierConfigChanged(int subId) { private void handleCarrierConfigChanged(int subId) {

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

@@ -290,7 +290,7 @@ public class NetworkSelectSettingsTest {
List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235")); List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));
doReturn(testSatellitePlmn).when( doReturn(testSatellitePlmn).when(
mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper(); mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();
/* Expect filter out satellite plmns when /* Expect filter out satellite plmns when
KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL is true, and there is available 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")); List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));
doReturn(testSatellitePlmn).when( doReturn(testSatellitePlmn).when(
mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper(); mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();
// Expect no filter out when there is no available satellite plmns. // Expect no filter out when there is no available satellite plmns.
mNetworkSelectSettings.onCreateInitialization(); mNetworkSelectSettings.onCreateInitialization();
testSatellitePlmn = new ArrayList<>(); testSatellitePlmn = new ArrayList<>();
doReturn(testSatellitePlmn).when( doReturn(testSatellitePlmn).when(
mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper(); mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();
mNetworkSelectSettings.onCreateInitialization(); mNetworkSelectSettings.onCreateInitialization();
List<CellInfo> testList = Arrays.asList( List<CellInfo> testList = Arrays.asList(
createLteCellInfo(true, 123, "123", "232", "CarrierA"), createLteCellInfo(true, 123, "123", "232", "CarrierA"),
@@ -356,7 +356,7 @@ public class NetworkSelectSettingsTest {
List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235")); List<String> testSatellitePlmn = new ArrayList<>(Arrays.asList("123232", "123235"));
doReturn(testSatellitePlmn).when( doReturn(testSatellitePlmn).when(
mNetworkSelectSettings).getAllSatellitePlmnsForCarrierWrapper(); mNetworkSelectSettings).getSatellitePlmnsForCarrierWrapper();
// Expect no filter out when KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL is false. // Expect no filter out when KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL is false.
config.putBoolean( config.putBoolean(