From 5a677a1c72f866e63c20d97fc029a4370a2682a2 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 16 Aug 2024 06:28:51 +0000 Subject: [PATCH 01/11] thermal: read thermistor temp from sysfs - avoid wrong sensor value reading for thermalHAL Bug: 327327502 Test: Build to boot to home Flag: EXEMPT (bug 337358613) Change-Id: Id1e70c4afe4b4637e0208b142540ae0117bb6d2f Signed-off-by: Peter (YM) --- thermal_info_config_charge_lynx.json | 8 -------- thermal_info_config_lynx.json | 8 -------- 2 files changed, 16 deletions(-) diff --git a/thermal_info_config_charge_lynx.json b/thermal_info_config_charge_lynx.json index 63e35fb..abb5f62 100644 --- a/thermal_info_config_charge_lynx.json +++ b/thermal_info_config_charge_lynx.json @@ -9,20 +9,17 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -30,7 +27,6 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { @@ -38,7 +34,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -46,19 +41,16 @@ { "Name":"skin_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp", "Multiplier":0.001 }, { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001 }, { diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index 22e6874..2b290d2 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -9,20 +9,17 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -30,7 +27,6 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { @@ -38,7 +34,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 27.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -46,19 +41,16 @@ { "Name":"skin_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp", "Multiplier":0.001 }, { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001 }, { From 086d2cea048c78eacdb9056399b07702e47733b7 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 12 Aug 2024 17:13:18 +0800 Subject: [PATCH 02/11] gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay Bug: 358041425 Test: verify pass Change-Id: I26703b29e53e033d6bc978a4e6ac667953d2f282 --- location/gps.6.1.xml.l10 | 1 + location/gps.xml.l10 | 1 + location/gps_user.6.1.xml.l10 | 1 + location/gps_user.xml.l10 | 1 + 4 files changed, 4 insertions(+) diff --git a/location/gps.6.1.xml.l10 b/location/gps.6.1.xml.l10 index 33aa2be..95ee3bf 100644 --- a/location/gps.6.1.xml.l10 +++ b/location/gps.6.1.xml.l10 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.l10 b/location/gps.xml.l10 index 009eb04..5e7e291 100644 --- a/location/gps.xml.l10 +++ b/location/gps.xml.l10 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.l10 b/location/gps_user.6.1.xml.l10 index 833b204..0331e0d 100644 --- a/location/gps_user.6.1.xml.l10 +++ b/location/gps_user.6.1.xml.l10 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10 index 2f131b1..1c4b639 100644 --- a/location/gps_user.xml.l10 +++ b/location/gps_user.xml.l10 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" From 1e4a6925d931b4e0251283afaf84811eb82f47db Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 27 Aug 2024 07:21:40 +0000 Subject: [PATCH 03/11] gps: Re-enable GLO & QZSS in US Change-Id: Ibc607508aeaba14b54876d0ce13ea493e6d76795 Test: on-device Bug: 353579502 --- location/gps.6.1.xml.l10 | 3 +++ location/gps.xml.l10 | 3 +++ location/gps_user.6.1.xml.l10 | 2 ++ location/gps_user.xml.l10 | 2 ++ 4 files changed, 10 insertions(+) diff --git a/location/gps.6.1.xml.l10 b/location/gps.6.1.xml.l10 index 95ee3bf..4a4b847 100644 --- a/location/gps.6.1.xml.l10 +++ b/location/gps.6.1.xml.l10 @@ -57,6 +57,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" @@ -96,6 +97,8 @@ /> diff --git a/location/gps.xml.l10 b/location/gps.xml.l10 index 5e7e291..b4d355c 100644 --- a/location/gps.xml.l10 +++ b/location/gps.xml.l10 @@ -57,6 +57,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" @@ -96,6 +97,8 @@ /> diff --git a/location/gps_user.6.1.xml.l10 b/location/gps_user.6.1.xml.l10 index 0331e0d..27a5a53 100644 --- a/location/gps_user.6.1.xml.l10 +++ b/location/gps_user.6.1.xml.l10 @@ -95,6 +95,8 @@ /> diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10 index 1c4b639..6f62071 100644 --- a/location/gps_user.xml.l10 +++ b/location/gps_user.xml.l10 @@ -95,6 +95,8 @@ /> From 2695d16fe289d0ad864eb526d06a1556208aa1e7 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:54:42 -0700 Subject: [PATCH 04/11] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: I2ee823a19315d8bfb079594d83e3a4f818ef504b --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index 38a4af5..3fe5807 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,15 +48,6 @@ default - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.graphics.composer hwbinder From 98621fdd5f03651f7bdfdb2243a7fbd6fb1c2d70 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 4 Sep 2024 12:05:36 -0700 Subject: [PATCH 05/11] lynx: add etm modules in userdebug/eng builds ETM modules are removed in kernel prebuilts. So add them manually. Bug: 364652655 Bug: 364309766 Test: build lynx Flag: build.RELEASE_ETM_IN_USERDEBUG_ENG Change-Id: I7faa1701445e477a7521e67d5274ccbf30d19fd0 --- device-lynx.mk | 7 +++++++ lynx/BoardConfig.mk | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index d38fa58..408a4f2 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -342,3 +342,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20491 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index b3cd8b8..cebad5f 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -43,3 +43,9 @@ include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk include device/google/lynx-sepolicy/lynx-sepolicy.mk include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif From de2199aefed85eedd5f005ea8982653af8e0df65 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:19:54 +0000 Subject: [PATCH 06/11] Update product id for lynx Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: Iab04bd0b3598a5b2532f0f527a77451db416f0dd --- device-lynx.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 408a4f2..5803dfd 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -340,8 +340,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.device_id=lynx # Bluetooth device id +# Raven: 0x410B PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20491 + bluetooth.device_id.product_id=16651 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) From ae1689beae84df4760bc2c921a83778e2cc2bee4 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:34:33 +0000 Subject: [PATCH 07/11] Symlink current prebuilt folder to android root The Android are now based on Trunk Stable world and Pixel prebuilts CLs also needs to reply with this which controlled by the flag which results: - the flag value might be different on each branches - the flag value are mostly different on each release configuration - for local builds, ENGs' needs to figure out the correct location of current prebuilts by checking through entire prebuilt textproto files To alleviate this problem, create an symlink file under android root indicates current prebuilt path after invoke the android lunch cmd. Bug: 364831620 Flag: EXEMPT export current prebuilt path Change-Id: Ibf76c45b14c9b5064e372f9c3febede823423bef Signed-off-by: Robin Peng --- lynx/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index cebad5f..9b10eb1 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -40,6 +40,7 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk include device/google/lynx-sepolicy/lynx-sepolicy.mk include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk From c778395dfec0c296daa67bfcb2020d6e99984756 Mon Sep 17 00:00:00 2001 From: James Huang Date: Fri, 26 Jul 2024 15:14:39 +0800 Subject: [PATCH 08/11] gps: Enable Beidou measurements only in the US for L10. Bug: 354884462 Test: Field test in the US Change-Id: I017d67a0832ab2039613aa32cd4c79821ffb8fcc --- location/gps.xml.l10 | 1 + location/gps_user.xml.l10 | 1 + 2 files changed, 2 insertions(+) diff --git a/location/gps.xml.l10 b/location/gps.xml.l10 index b4d355c..adc8585 100644 --- a/location/gps.xml.l10 +++ b/location/gps.xml.l10 @@ -100,6 +100,7 @@ EnableQzsAutoSwitch="false" EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10 index 6f62071..db993ca 100644 --- a/location/gps_user.xml.l10 +++ b/location/gps_user.xml.l10 @@ -98,6 +98,7 @@ EnableQzsAutoSwitch="false" EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" + ConstellationAutoSwitchOffNavOnly="true" /> From cd8d3c9819f3850573d7bad81fd49b49c7b4c2d0 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 23:00:53 +0800 Subject: [PATCH 09/11] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass Change-Id: I24ba47dafb991c395fa27ba7585c907e7b9f1920 --- location/gps.6.1.xml.l10 | 2 +- location/gps.xml.l10 | 2 +- location/gps_user.6.1.xml.l10 | 2 +- location/gps_user.xml.l10 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/location/gps.6.1.xml.l10 b/location/gps.6.1.xml.l10 index 4a4b847..aa2b787 100644 --- a/location/gps.6.1.xml.l10 +++ b/location/gps.6.1.xml.l10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.l10 b/location/gps.xml.l10 index adc8585..5a45e70 100644 --- a/location/gps.xml.l10 +++ b/location/gps.xml.l10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.l10 b/location/gps_user.6.1.xml.l10 index 27a5a53..005fe4d 100644 --- a/location/gps_user.6.1.xml.l10 +++ b/location/gps_user.6.1.xml.l10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10 index db993ca..ea78dd3 100644 --- a/location/gps_user.xml.l10 +++ b/location/gps_user.xml.l10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" From 1019f75bfdb4b1d322c07c7774b8da2b97304638 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Thu, 29 Feb 2024 13:25:36 +0000 Subject: [PATCH 10/11] dumpstate: touch: Init using touch_predump More info at go/touch_predump Test: Test locally on test device and check predump_touch works. Bug: 287907308 Change-Id: I35dbbf95aa586874b8f594eb09f964f4e7a84df6 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 5803dfd..1b897ea 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -31,7 +31,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay include device/google/lynx/audio/lynx/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs-common/touch/gti/gti.mk +include device/google/gs-common/touch/gti/predump_gti.mk include device/google/gs-common/wlan/dump.mk # go/lyric-soong-variables From 117b1153bc7799fa03fc16b7f4bbfb0c548ed53d Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 25 Sep 2024 06:25:37 +0000 Subject: [PATCH 11/11] Remove vibrator HAL service Remove from device mk files due to relocation to vendor directory. Bug: 362659323 Test: Build Pass Flag: EXEMPT refactor Change-Id: I672c827aad9a4e096fa5d653d0e7b20ff96b6425 --- device-lynx.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 1b897ea..86f5409 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -30,7 +30,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay include device/google/lynx/audio/lynx/audio-tables.mk include device/google/gs201/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/touch/gti/predump_gti.mk include device/google/gs-common/wlan/dump.mk