commit fd58065cdbaeb1047981915bfdcc7b5d73a5ab8f
author Hakjun Choi <hakjunc@google.com> Sat Jan 27 04:22:26 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 27 04:22:26 2024 +0000
tree 2ff6040566a32eda64e1d2ec586535f4092391ac
parent 4fd3d8d4e6b274fa9a276a6818804dfed9f65afa
parent 7f2f0612d15cd38a97b3a52426940340a67e3e04

Merge "Reflect satellite api refactoring to Settings" into main

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

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) {

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

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) {