From d700db672f70c13bb6c5c6a7b574da918fc9b3f2 Mon Sep 17 00:00:00 2001 From: James Huang Date: Tue, 20 Feb 2024 18:31:08 +0800 Subject: [PATCH 1/4] gps: update gps version 4.15.0.145 Update IsUseEntireRespTime911 and isForceHighAccuracyMode Update NmeaBitmask Bug: 317851543 Bug: 326003464 Test: Verify CTS/VTS and GNSS basic sanity test Change-Id: Ifa449c048439702b6f2655d798a94f62dced858a --- location/caiman/user/gps.cfg | 2 ++ location/caiman/userdebug/gps.cfg | 6 ++++++ location/komodo/user/gps.cfg | 2 ++ location/komodo/userdebug/gps.cfg | 6 ++++++ location/ripcurrent24/user/gps.cfg | 2 ++ location/ripcurrent24/userdebug/gps.cfg | 7 +++++++ location/ripcurrentpro/user/gps.cfg | 2 ++ location/ripcurrentpro/userdebug/gps.cfg | 7 +++++++ location/tokay/user/gps.cfg | 2 ++ location/tokay/userdebug/gps.cfg | 6 ++++++ 10 files changed, 42 insertions(+) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 13773ce3..0d5bd46d 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -57,6 +57,8 @@ RfPathLossDb_Ap=3210 RfPathLossDb_Cp=3210 RfPathLossDb_L5_Ap=4450 RfPathLossDb_L5_Cp=4450 +IsUseEntireRespTime911=1 +isForceHighAccuracyMode=1 isUseUncalAccel=0 GNSS_CARRIER_CONFIG_BEGIN diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 20242d5a..d0ead853 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -181,6 +181,12 @@ RfPathLossDb_Ap=3210 RfPathLossDb_Cp=3210 RfPathLossDb_L5_Ap=4450 RfPathLossDb_L5_Cp=4450 +NmeaBitmask=0x010003fff + +# force engine to use entire response time for emergency session; default 0 +IsUseEntireRespTime911=1 +# force engine to engage high accuracy if entire response time used; default 0 +isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data isUseUncalAccel=0 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index 0fd68bde..f4e75657 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -57,6 +57,8 @@ RfPathLossDb_Ap=3520 RfPathLossDb_Cp=3520 RfPathLossDb_L5_Ap=3700 RfPathLossDb_L5_Cp=3700 +IsUseEntireRespTime911=1 +isForceHighAccuracyMode=1 isUseUncalAccel=0 GNSS_CARRIER_CONFIG_BEGIN diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index e1df3e9d..7c0573f3 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -181,6 +181,12 @@ RfPathLossDb_Ap=3520 RfPathLossDb_Cp=3520 RfPathLossDb_L5_Ap=3700 RfPathLossDb_L5_Cp=3700 +NmeaBitmask=0x010003fff + +# force engine to use entire response time for emergency session; default 0 +IsUseEntireRespTime911=1 +# force engine to engage high accuracy if entire response time used; default 0 +isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data isUseUncalAccel=0 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 0f943504..680132f1 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -53,6 +53,8 @@ UP_LocTech_Constraints=1 UP_LocTech_Requirements=0 SpotLogger_Allowed=0 soft_dog=0 +IsUseEntireRespTime911=1 +isForceHighAccuracyMode=1 isUseUncalAccel=0 GNSS_CARRIER_CONFIG_BEGIN diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 4d535e32..b1ff1e93 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -177,6 +177,13 @@ SpotLogger_Allowed=0 soft_dog=0 +NmeaBitmask=0x010003fff + +# force engine to use entire response time for emergency session; default 0 +IsUseEntireRespTime911=1 +# force engine to engage high accuracy if entire response time used; default 0 +isForceHighAccuracyMode=1 + # 0: Use calibrated Accel data 1: Use uncalibrated Accel data isUseUncalAccel=0 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 0f943504..680132f1 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -53,6 +53,8 @@ UP_LocTech_Constraints=1 UP_LocTech_Requirements=0 SpotLogger_Allowed=0 soft_dog=0 +IsUseEntireRespTime911=1 +isForceHighAccuracyMode=1 isUseUncalAccel=0 GNSS_CARRIER_CONFIG_BEGIN diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 4d535e32..b1ff1e93 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -177,6 +177,13 @@ SpotLogger_Allowed=0 soft_dog=0 +NmeaBitmask=0x010003fff + +# force engine to use entire response time for emergency session; default 0 +IsUseEntireRespTime911=1 +# force engine to engage high accuracy if entire response time used; default 0 +isForceHighAccuracyMode=1 + # 0: Use calibrated Accel data 1: Use uncalibrated Accel data isUseUncalAccel=0 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 2d0f5a65..3f685df7 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -57,6 +57,8 @@ RfPathLossDb_Ap=3550 RfPathLossDb_Cp=3550 RfPathLossDb_L5_Ap=3870 RfPathLossDb_L5_Cp=3870 +IsUseEntireRespTime911=1 +isForceHighAccuracyMode=1 isUseUncalAccel=0 GNSS_CARRIER_CONFIG_BEGIN diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 6e1780b0..837a32dc 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -181,6 +181,12 @@ RfPathLossDb_Ap=3550 RfPathLossDb_Cp=3550 RfPathLossDb_L5_Ap=3870 RfPathLossDb_L5_Cp=3870 +NmeaBitmask=0x010003fff + +# force engine to use entire response time for emergency session; default 0 +IsUseEntireRespTime911=1 +# force engine to engage high accuracy if entire response time used; default 0 +isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data isUseUncalAccel=0 From 1abbab87f9672d7f93ab67f1493884b47cab9d9b Mon Sep 17 00:00:00 2001 From: John Pan Date: Tue, 20 Feb 2024 15:38:10 +0800 Subject: [PATCH 2/4] Don't use default wallpaper when factory build Bug: 325851912 Test: Build pass; Manual Change-Id: I962ea1e1577d32874a0d6dbb2f89dd23e4f1919d --- device-caiman.mk | 5 ++++- device-komodo.mk | 5 ++++- device-tokay.mk | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index b662eb00..1fa18274 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -28,11 +28,14 @@ endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-caiman.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersCaiman.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/caiman/device-vendor-caiman.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) +ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),) + $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersCaiman.mk) +endif + # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay diff --git a/device-komodo.mk b/device-komodo.mk index 474cbdf9..fb5fa619 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -28,11 +28,14 @@ endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-komodo.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersKomodo.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/komodo/device-vendor-komodo.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) +ifeq ($(filter factory_komodo, $(TARGET_PRODUCT)),) + $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersKomodo.mk) +endif + # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay diff --git a/device-tokay.mk b/device-tokay.mk index 3ca68980..257aa55b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -19,10 +19,13 @@ TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersTokay.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/tokay/device-vendor-tokay.mk) +ifeq ($(filter factory_tokay, $(TARGET_PRODUCT)),) + $(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersTokay.mk) +endif + # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay From 74808432c4187a3cd89b0cb0adccb652f3ce2ed9 Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Thu, 22 Feb 2024 08:08:35 +0800 Subject: [PATCH 3/4] Add radioext aidl Bug: 322125172 Test: manual, device logs show radioext-aidl is running Change-Id: I08af250a82f6fd8df98b7f1cf932ff4f64bec46c --- device-caiman.mk | 1 + device-komodo.mk | 1 + device-tokay.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index b662eb00..7ed4749a 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -47,6 +47,7 @@ include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/syna/syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk +include device/google/gs-common/modem/radio_ext/radio_ext.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index 474cbdf9..d61fe03f 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -47,6 +47,7 @@ include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/syna/syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk +include device/google/gs-common/modem/radio_ext/radio_ext.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index 9cd57503..bec207ba 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -37,6 +37,7 @@ include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/syna/syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk +include device/google/gs-common/modem/radio_ext/radio_ext.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay) From 04ea8035cf34e9822fb04703424b413483b2b67c Mon Sep 17 00:00:00 2001 From: Alan Chen Date: Thu, 22 Feb 2024 09:34:43 +0800 Subject: [PATCH 4/4] Update coex table Bug: 326172562 Test: manual, no black screen from mds simulation Change-Id: Ifc730249eae6adbded4e66ddda7d9743668aba23 --- .../coex/display_primary_mipi_coex_table.csv | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/radio/komodo/coex/display_primary_mipi_coex_table.csv b/radio/komodo/coex/display_primary_mipi_coex_table.csv index f383da0e..885a0440 100644 --- a/radio/komodo/coex/display_primary_mipi_coex_table.csv +++ b/radio/komodo/coex/display_primary_mipi_coex_table.csv @@ -1,4 +1,4 @@ -684000,6440000 +684000,644000 SNH,684000 CHA,684000 @@ -11,9 +11,9 @@ CHA,684000 4546000,4548000,684000 5796000,5805000,684000 7075000,7084000,684000 -1525000,1559000,6440000 -2172000,2174000,6440000 -2193000,2195000,6440000 -3415000,3425000,6440000 -4740000,4742000,6440000 -6155000,6156000,6440000 \ No newline at end of file +1525000,1559000,644000 +2172000,2174000,644000 +2193000,2195000,644000 +3415000,3425000,644000 +4740000,4742000,644000 +6155000,6156000,644000 \ No newline at end of file