From 18ce6dea5fd330483e54af1f31cc832736688d9a Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Wed, 4 Sep 2024 11:26:59 +0800 Subject: [PATCH 1/2] gps: official release 4.15.1_26_240906_R2_234413 Support new requirement to report DBH position along with UBP measurement Bug: 321229708 Test: b/364445928 atest CtsLocationGnssTestCases atest VtsHalGnssTargetTest Change-Id: I6c5c415e3ed1ec3ea96c243493f58424362eeaa7 --- location/gps.cfg | 1 + location/gps_user.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/location/gps.cfg b/location/gps.cfg index 1fabfa7..cd15fde 100644 --- a/location/gps.cfg +++ b/location/gps.cfg @@ -244,6 +244,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/gps_user.cfg b/location/gps_user.cfg index 9a16ca4..96b12f4 100644 --- a/location/gps_user.cfg +++ b/location/gps_user.cfg @@ -115,6 +115,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 From 8e52443019c6170c5ed37cc9aacc4e3e0c308d30 Mon Sep 17 00:00:00 2001 From: Charles Yo Date: Mon, 9 Sep 2024 11:22:13 +0000 Subject: [PATCH 2/2] Revert "Enable radioext 2.0 and include gril_aidl.mk for tegu" Bug: 365505327 Reason for revert: BB on 25D4-Release Change-Id: I3cf0bfde349b7bf693d25aa355dfe7a643c2bb1b --- device-tegu.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/device-tegu.mk b/device-tegu.mk index 66129f4..b15724e 100644 --- a/device-tegu.mk +++ b/device-tegu.mk @@ -14,9 +14,6 @@ # limitations under the License. # -USES_RADIOEXT_V1_7 = false -USES_RADIOEXT_V2_0 = true - ifdef RELEASE_GOOGLE_TEGU_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_TEGU_RADIO_DIR) endif @@ -55,9 +52,8 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/predump_gti.mk include device/google/gs-common/touch/syna/predump_syna20.mk -include device/google/gs-common/gril/aidl/2.0/gril_aidl.mk +include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/esim/esim.mk - # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tegu) $(call soong_config_set,lyric,tuning_product,tegu)