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

Commit 7f2f0612 authored by Hakjun Choi's avatar Hakjun Choi
Browse files

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
parent 5fe47148

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

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class SatelliteSettingPreferenceController extends 
    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) {