Merge cherrypicks of ['googleplex-android-review.googlesource.com/28898856', 'googleplex-android-review.googlesource.com/28898857'] into sparse-12267184-L60000030005978156.

SPARSE_CHANGE: I91ae5a9bd35a51b9bfc3580582ef157580011f1c
SPARSE_CHANGE: Ibc60cbd1edb05640fefb433c44eaa8710e4f71f7

Change-Id: I9bd75133e3d8ccbe655c1c82384f28afb4268512
This commit is contained in:
Android Build Coastguard Worker 2024-08-23 17:40:04 +00:00
commit df32f4d305
10 changed files with 30 additions and 10 deletions

View file

@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -125,7 +128,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
# ATT # ATT
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
# TMO # TMO
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -281,7 +284,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
# VZW # VZW
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -125,7 +128,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
# ATT # ATT
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
# TMO # TMO
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -281,7 +284,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
# VZW # VZW
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -110,8 +110,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -121,7 +124,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -266,8 +266,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
# ATT # ATT
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
# TMO # TMO
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -277,7 +280,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
# VZW # VZW
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -110,8 +110,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -121,7 +124,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -266,8 +266,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
# ATT # ATT
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
# TMO # TMO
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -277,7 +280,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
# VZW # VZW
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -114,8 +114,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -125,7 +128,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2

View file

@ -270,8 +270,11 @@ ENABLE_NLP_IN_LPPE=1
ENABLE_NLP_IN_AGNSS=0 ENABLE_NLP_IN_AGNSS=0
ENABLE_LPP_HA_GAD_SHAPE=0 ENABLE_LPP_HA_GAD_SHAPE=0
USE_EMER_PDN_FOR_EMER_SUPL=1 USE_EMER_PDN_FOR_EMER_SUPL=1
CP_LOCTECH_CONSTRAINTS=1
UP_LOCTECH_CONSTRAINTS=1
# ATT # ATT
GNSS_CARRIER_ID=1 GNSS_CARRIER_ID=1
CP_LOCTECH_CONSTRAINTS=5
# TMO # TMO
GNSS_CARRIER_ID=2 GNSS_CARRIER_ID=2
ENABLE_3G_CP_CAPS_MSA=0 ENABLE_3G_CP_CAPS_MSA=0
@ -281,7 +284,6 @@ ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1 ENABLE_LPP_HA_GAD_SHAPE=1
# VZW # VZW
GNSS_CARRIER_ID=3 GNSS_CARRIER_ID=3
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
SUPL_SSL_METHOD=TLSv1_2 SUPL_SSL_METHOD=TLSv1_2