diff options
| author | Hakjun Choi <hakjunc@google.com> | 2024-01-19 08:20:46 +0000 |
|---|---|---|
| committer | Hakjun Choi <hakjunc@google.com> | 2024-01-28 04:52:03 +0000 |
| commit | 26b7b3325900de06e39799598f94547379aefccf (patch) | |
| tree | a88451dcfc2415085bdffed909441ed88fce6141 /src | |
| parent | d4c8e083075d3c6a1574f86f16337c08516dced5 (diff) | |
| download | telephony-26b7b3325900de06e39799598f94547379aefccf.tar.gz | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java | 2 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/satellite/SatelliteController.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java b/src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java index 4d294f4316..add01c06db 100644 --- a/src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java +++ b/src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java @@ -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)) { diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java index 60fd6a78be..aaabaff26e 100644 --- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java +++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java @@ -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) { |