diff options
author | 2025-03-27 12:21:37 -0700 | |
---|---|---|
committer | 2025-03-30 15:22:06 -0700 | |
commit | 577e9a0d279d9fd5b5a7037d51dd568291693447 (patch) | |
tree | 94033eb0cbd8b886b80fe7b60eb65eaa89b8335f /src | |
parent | 0f40261c9b435c1eff821aa3084a1b1febfc83c8 (diff) |
Ignore geofence carrier tag IDs requirements for old devices
- Ignore geofence carrier tag IDs requirements for device that don't support new format of geofence data
Flag: EXEMPT bugfix
Bug: 404710263
Test: SatelliteManagerTestOnMockService
Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8e9b66a36e2562a4084e056a8fcc62b8d57c84fb)
Merged-In: I92d6d630c0cf0d8c64bbb9710b4c1ed1f7bd6904
Change-Id: I92d6d630c0cf0d8c64bbb9710b4c1ed1f7bd6904
Diffstat (limited to 'src')
-rw-r--r-- | src/java/com/android/internal/telephony/satellite/SatelliteController.java | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java index d311b8a663..a39ba91bda 100644 --- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java +++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java @@ -7927,14 +7927,37 @@ public class SatelliteController extends Handler { } if(carrierTagIds == null) { - plogd("isSatelliteAvailableAtCurrentLocation: tagids for carrier satellite enabled " + - "are not available"); - return false; + String satelliteAccessConfigFile = + getSatelliteAccessConfigurationFileFromOverlayConfig(); + if (TextUtils.isEmpty(satelliteAccessConfigFile)) { + plogd("isSatelliteAvailableAtCurrentLocation: device does not support" + + " custom satellite access configuration per location"); + return true; + } else { + plogd("isSatelliteAvailableAtCurrentLocation: tagids for carrier " + + info.getCarrierName() + ", subId=" + info.getSubscriptionId() + + " are not available"); + return false; + } } return isCarrierSatelliteAvailableAtCurrentLocation(carrierTagIds); } + @Nullable + private String getSatelliteAccessConfigurationFileFromOverlayConfig() { + String satelliteAccessConfigFile = null; + try { + satelliteAccessConfigFile = mContext.getResources().getString( + com.android.internal.R.string.satellite_access_config_file); + } catch (Resources.NotFoundException ex) { + loge("getSatelliteAccessConfigurationFileFromOverlayConfig: got ex=" + ex); + } + + logd("satelliteAccessConfigFile =" + satelliteAccessConfigFile); + return satelliteAccessConfigFile; + } + /** * Compares tagIds and determine if * carrier satellite is available at current location while selecting highest priority profile. |