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

Commit fd58065c authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Reflect satellite api refactoring to Settings" into main

parents 4fd3d8d4 7f2f0612

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