PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reflect satellite api refactoring to Settings" into main

Browse Source
This commit is contained in:
Hakjun Choi
2024-01-27 04:22:26 +00:00
committed by Android (Google) Code Review
parent 4fd3d8d4e6 7f2f0612d1
commit fd58065cdb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/SatelliteSetting.java
View File

@@ -183,7 +183,7 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
private boolean isSatelliteEligible() { private boolean isSatelliteEligible() {
try { try {
Set<Integer> restrictionReason = Set<Integer> restrictionReason =
mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId); mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);
return !restrictionReason.contains( return !restrictionReason.contains(
SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT); SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT);
} catch (SecurityException | IllegalStateException | IllegalArgumentException ex) { } catch (SecurityException | IllegalStateException | IllegalArgumentException ex) {

2
src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
View File

@@ -113,7 +113,7 @@ public class SatelliteSettingPreferenceController extends
private void updateSummary(Preference preference) { private void updateSummary(Preference preference) {
try { try {
Set<Integer> restrictionReason = Set<Integer> restrictionReason =
mSatelliteManager.getSatelliteAttachRestrictionReasonsForCarrier(mSubId); mSatelliteManager.getAttachRestrictionReasonsForCarrier(mSubId);
boolean isSatelliteEligible = !restrictionReason.contains( boolean isSatelliteEligible = !restrictionReason.contains(
SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT); SatelliteManager.SATELLITE_COMMUNICATION_RESTRICTION_REASON_ENTITLEMENT);
if (mIsSatelliteEligible == null || mIsSatelliteEligible != isSatelliteEligible) { if (mIsSatelliteEligible == null || mIsSatelliteEligible != isSatelliteEligible) {