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/TelephonyShellCommand.java

diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 93ac55e..cd6a369 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -3593,9 +3593,11 @@
         String s2CellFile = null;
         long locationFreshDurationNanos = 0;
         List<String> satelliteCountryCodes = null;
+        String satelliteAccessConfigurationFile = null;
 
         String opt;
         while ((opt = getNextOption()) != null) {
+            Log.d(LOG_TAG, "handleSetSatelliteAccessControlOverlayConfigs: opt=" + opt);
             switch (opt) {
                 case "-r": {
                     reset = true;
@@ -3618,16 +3620,22 @@
                     satelliteCountryCodes = Arrays.asList(countryCodeStr.split(","));
                     break;
                 }
+                case "-g": {
+                    satelliteAccessConfigurationFile = getNextArgRequired();
+                    break;
+                }
             }
         }
         Log.d(LOG_TAG, "handleSetSatelliteAccessControlOverlayConfigs: reset=" + reset
                 + ", isAllowed=" + isAllowed + ", s2CellFile=" + s2CellFile
                 + ", locationFreshDurationNanos=" + locationFreshDurationNanos
-                + ", satelliteCountryCodes=" + satelliteCountryCodes);
+                + ", satelliteCountryCodes=" + satelliteCountryCodes
+                + ", satelliteAccessConfigurationFile=" + satelliteAccessConfigurationFile);
 
         try {
             boolean result = mInterface.setSatelliteAccessControlOverlayConfigs(reset, isAllowed,
-                    s2CellFile, locationFreshDurationNanos, satelliteCountryCodes);
+                    s2CellFile, locationFreshDurationNanos, satelliteCountryCodes,
+                    satelliteAccessConfigurationFile);
             if (VDBG) {
                 Log.v(LOG_TAG, "setSatelliteAccessControlOverlayConfigs result =" + result);
             }