commit 364b6ff62cfb8748e2b611da01d8e01bb569beb3
author Hakjun Choi <hakjunc@google.com> Wed Nov 20 07:38:44 2024 +0000
committer Hakjun Choi <hakjunc@google.com> Mon Nov 25 08:27:33 2024 +0000
tree fe4b384c49c7ff4a5fe74f3a99f3b2db5ec66a32
parent 0f31d1f00721da0b6d830f51d621f15650956fd1

[NTN][Geofence] CTS for geofence enhancement

Added an enhanced sats2dat test file, which contains entry values
Added an test purpose satellite configuration file
Added logics for loading / parsing / triggering satellite configuration

Bug: 379944543
Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn
Test: Generte new sats2 dat file and verify with tool
Test: atest cts/SatelliteManagerTestOnMockService to verify whether
it works as intended

Change-Id: I83c8f84884cf2e3b58e2a9d246577cf68bb62089

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6e7306a..cf83585 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -14363,12 +14363,13 @@
      */
     public boolean setSatelliteAccessControlOverlayConfigs(boolean reset, boolean isAllowed,
             String s2CellFile, long locationFreshDurationNanos,
-            List<String> satelliteCountryCodes) {
+            List<String> satelliteCountryCodes, String satelliteAccessConfigurationFile) {
         Log.d(LOG_TAG, "setSatelliteAccessControlOverlayConfigs: reset=" + reset
                 + ", isAllowed" + isAllowed + ", s2CellFile=" + s2CellFile
                 + ", locationFreshDurationNanos=" + locationFreshDurationNanos
                 + ", satelliteCountryCodes=" + ((satelliteCountryCodes != null)
-                ? String.join(", ", satelliteCountryCodes) : null));
+                ? String.join(", ", satelliteCountryCodes) : null)
+                + ", satelliteAccessConfigurationFile=" + satelliteAccessConfigurationFile);
         TelephonyPermissions.enforceShellOnly(
                 Binder.getCallingUid(), "setSatelliteAccessControlOverlayConfigs");
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
@@ -14377,7 +14378,8 @@
         final long identity = Binder.clearCallingIdentity();
         try {
             return mSatelliteAccessController.setSatelliteAccessControlOverlayConfigs(reset,
-                    isAllowed, s2CellFile, locationFreshDurationNanos, satelliteCountryCodes);
+                    isAllowed, s2CellFile, locationFreshDurationNanos, satelliteCountryCodes,
+                    satelliteAccessConfigurationFile);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }