From ee03c2084dd5b857269ff787cbc4dba6b29d76e7 Mon Sep 17 00:00:00 2001 From: James Huang Date: Tue, 20 Aug 2024 12:41:59 +0800 Subject: [PATCH 1/2] gps: Update release 4.15.3_4_240822_R1 config Enable GAL for E911 location for ATT by Set CP_LocTech_Constraints to 5 Bug: 316151601 Test: CTS/VTS, validation test/stress test (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dfc7653299dc471b0a9478dad214e368409d5602) Merged-In: I91ae5a9bd35a51b9bfc3580582ef157580011f1c Change-Id: I91ae5a9bd35a51b9bfc3580582ef157580011f1c --- location/caiman/user/gps.cfg | 3 +++ location/caiman/userdebug/gps.cfg | 3 +++ location/komodo/user/gps.cfg | 3 +++ location/komodo/userdebug/gps.cfg | 3 +++ location/ripcurrent24/user/gps.cfg | 3 +++ location/ripcurrent24/userdebug/gps.cfg | 3 +++ location/ripcurrentpro/user/gps.cfg | 3 +++ location/ripcurrentpro/userdebug/gps.cfg | 3 +++ location/tokay/user/gps.cfg | 3 +++ location/tokay/userdebug/gps.cfg | 3 +++ 10 files changed, 30 insertions(+) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 8c6515aa..745ce932 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 9276d626..92945760 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 # ATT GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 # TMO GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index fcbf35cf..8c984f02 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index f7005830..4848595d 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 # ATT GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 # TMO GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 337e44bc..0c526912 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -110,8 +110,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 418045c1..ae2fdf21 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -266,8 +266,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 # ATT GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 # TMO GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 337e44bc..0c526912 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -110,8 +110,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 418045c1..ae2fdf21 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -266,8 +266,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 # ATT GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 # TMO GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 6a6f63df..53931f75 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 74f52461..4bd46561 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 USE_EMER_PDN_FOR_EMER_SUPL=1 +CP_LOCTECH_CONSTRAINTS=1 +UP_LOCTECH_CONSTRAINTS=1 # ATT GNSS_CARRIER_ID=1 +CP_LOCTECH_CONSTRAINTS=5 # TMO GNSS_CARRIER_ID=2 ENABLE_3G_CP_CAPS_MSA=0 From cb9688c25f4b581c9e67d5fd698dc528c9bf83a1 Mon Sep 17 00:00:00 2001 From: James Huang Date: Tue, 20 Aug 2024 16:05:21 +0800 Subject: [PATCH 2/2] gps: Remove ENABLE_CAPS_OTDOA to enable OTDOA in VZW network. Bug: 361007684 Test: verify the cfg item aligned (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:438108565a93412e1ddf9ec93d97952b6bf38815) Merged-In: Ibc60cbd1edb05640fefb433c44eaa8710e4f71f7 Change-Id: Ibc60cbd1edb05640fefb433c44eaa8710e4f71f7 --- location/caiman/user/gps.cfg | 1 - location/caiman/userdebug/gps.cfg | 1 - location/komodo/user/gps.cfg | 1 - location/komodo/userdebug/gps.cfg | 1 - location/ripcurrent24/user/gps.cfg | 1 - location/ripcurrent24/userdebug/gps.cfg | 1 - location/ripcurrentpro/user/gps.cfg | 1 - location/ripcurrentpro/userdebug/gps.cfg | 1 - location/tokay/user/gps.cfg | 1 - location/tokay/userdebug/gps.cfg | 1 - 10 files changed, 10 deletions(-) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 745ce932..1a96deab 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -128,7 +128,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 92945760..b8c7e9fb 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -284,7 +284,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 # VZW GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index 8c984f02..7a3e0de5 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -128,7 +128,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index 4848595d..b512d8e4 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -284,7 +284,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 # VZW GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 0c526912..cc216cd0 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -124,7 +124,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index ae2fdf21..db39bfff 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -280,7 +280,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 # VZW GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 0c526912..cc216cd0 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -124,7 +124,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index ae2fdf21..db39bfff 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -280,7 +280,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 # VZW GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 53931f75..e96d6dda 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -128,7 +128,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 4bd46561..7ecd28c8 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -284,7 +284,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 # VZW GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_SSL_METHOD=TLSv1_2