Merge "Add enhanced geofencing data and satelltie access config json for Zuma Pro" into main

device.mk

@@ -1319,7 +1319,8 @@ endif
 
 # Telephony satellite geofence data file
 PRODUCT_COPY_FILES += \
-        device/google/zumapro/telephony/sats2.dat:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/sats2.dat
+        device/google/zumapro/telephony/sats2.dat:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/sats2.dat \
+        device/google/zumapro/telephony/satellite_access_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/satellite_access_config.json
 
 # Touch service
 include device/google/gs-common/touch/twoshay/aidl_zuma.mk

overlay/frameworks/base/core/res/res/values/config.xml

@@ -545,6 +545,9 @@
          in the satellite availability state at the current location. -->
     <bool name="config_satellite_should_notify_availability">false</bool>
 
+    <!-- The absolute path to the satellite config file. -->
+    <string name="satellite_access_config_file">/vendor/etc/telephony/satellite_access_config.json</string>
+
     <!-- Whether to allow check message datagrams to be sent even when the satellite modem is in
          not connected state. -->
     <bool name="config_satellite_allow_check_message_in_not_connected">true</bool>

telephony/satellite_access_config.json

@@ -0,0 +1,159 @@
+{
+  "access_control_configs": [
+    {
+      "config_id": 0,
+      "satellite_infos": [
+        {
+          "satellite_id": "c9d78ffa-ffa5-4d41-a81b-34693b33b496",
+          "satellite_position": {
+            "longitude": -101.3,
+            "altitude": 35786.0
+          },
+          "bands": [
+            255
+          ],
+          "earfcn_ranges": [
+            {
+              "start_earfcn": 229011,
+              "end_earfcn": 229011
+            },
+            {
+              "start_earfcn": 229013,
+              "end_earfcn": 229013
+            },
+            {
+              "start_earfcn": 229015,
+              "end_earfcn": 229015
+            },
+            {
+              "start_earfcn": 229017,
+              "end_earfcn": 229017
+            }
+          ]
+        }
+      ],
+      "tag_ids": [
+        11,
+        1001
+      ]
+    },
+    {
+      "config_id": 1,
+      "satellite_infos": [
+        {
+          "satellite_id": "62de127d-ead1-481f-8524-b58e2664103a",
+          "satellite_position": {
+            "longitude": -98.0,
+            "altitude": 35775.1
+          },
+          "bands": [
+            255
+          ],
+          "earfcn_ranges": [
+            {
+              "start_earfcn": 228837,
+              "end_earfcn": 228837
+            }
+          ]
+        }
+      ],
+      "tag_ids": [
+        11,
+        1001
+      ]
+    },
+    {
+      "config_id": 2,
+      "satellite_infos": [
+        {
+          "satellite_id": "62de127d-ead1-481f-8524-b58e2664103a",
+          "satellite_position": {
+            "longitude": -98.0,
+            "altitude": 35775.1
+          },
+          "bands": [
+            255
+          ],
+          "earfcn_ranges": [
+            {
+              "start_earfcn": 228909,
+              "end_earfcn": 228909
+            },
+            {
+              "start_earfcn": 228919,
+              "end_earfcn": 228919
+            }
+          ]
+        }
+      ],
+      "tag_ids": [
+        11
+      ]
+    },
+    {
+      "config_id": 3,
+      "satellite_infos": [
+        {
+          "satellite_id": "c9d78ffa-ffa5-4d41-a81b-34693b33b496",
+          "satellite_position": {
+            "longitude": -101.3,
+            "altitude": 35786.0
+          },
+          "bands": [
+            255
+          ],
+          "earfcn_ranges": [
+            {
+              "start_earfcn": 229011,
+              "end_earfcn": 229011
+            },
+            {
+              "start_earfcn": 229013,
+              "end_earfcn": 229013
+            },
+            {
+              "start_earfcn": 229015,
+              "end_earfcn": 229015
+            },
+            {
+              "start_earfcn": 229017,
+              "end_earfcn": 229017
+            }
+          ]
+        }
+      ],
+      "tag_ids": [
+        12
+      ]
+    },
+    {
+      "config_id": 4,
+      "satellite_infos": [
+        {
+          "satellite_id": "62de127d-ead1-481f-8524-b58e2664103a",
+          "satellite_position": {
+            "longitude": -98.0,
+            "altitude": 35775.1
+          },
+          "bands": [
+            255
+          ],
+          "earfcn_ranges": [
+            {
+              "start_earfcn": 228919,
+              "end_earfcn": 228919
+            },
+            {
+              "start_earfcn": 228909,
+              "end_earfcn": 228909
+            }
+          ]
+        }
+      ],
+      "tag_ids": [
+        11,
+        1001
+      ]
+    }
+  ]
+}