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

Reflect satellite api refactoring to Settings

Browse Source 
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
This commit is contained in:
Hakjun Choi
2024-01-24 11:44:07 +00:00
parent 5fe4714851
commit 7f2f0612d1
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) {