Reflect satellite api refactoring to Settings
Removed the word Satellite from all the method names might improve brevity and readability excluding cases that cause confusion.
Bug: 297933128
Test: manual test using testSatelliteApp
Change-Id: Ia817b8bf531031c28264750c03a6f7004ed81aa5
diff --git a/src/com/android/settings/network/telephony/SatelliteSetting.java b/src/com/android/settings/network/telephony/SatelliteSetting.java
index ecfa8e4..b6d018a 100644
--- a/src/com/android/settings/network/telephony/SatelliteSetting.java
+++ b/src/com/android/settings/network/telephony/SatelliteSetting.java
@@ -183,7 +183,7 @@
private boolean isSatelliteEligible() {
try {
Set<Integer> restrictionReason =
- mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId);
+ mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);
return !restrictionReason.contains(
SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT);
} catch (SecurityException | IllegalStateException | IllegalArgumentException ex) {
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
index 7de7fcb..94940b3 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
@@ -113,7 +113,7 @@
private void updateSummary(Preference preference) {
try {
Set<Integer> restrictionReason =
- mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId);
+ mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);
boolean isSatelliteEligible = !restrictionReason.contains(
SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT);
if (mIsSatelliteEligible == null || mIsSatelliteEligible != isSatelliteEligible) {