From 8900a083d717fcffd5f0f69a5a4c301f6e40442b Mon Sep 17 00:00:00 2001 From: James Huang Date: Fri, 26 Jul 2024 15:21:43 +0800 Subject: [PATCH 1/9] gps: Enable Beidou measurements only in the US for B3. Bug: 354884462 Test: Field test in the US Change-Id: I78796d5f1ac8ce7b4e3d110e2de1f05f988e4a01 --- gps.xml.b3 | 1 + gps_user.xml.b3 | 1 + 2 files changed, 2 insertions(+) diff --git a/gps.xml.b3 b/gps.xml.b3 index 9ee4e24..0b02145 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -95,6 +95,7 @@ diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index 74a7178..e2d2e8b 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -94,6 +94,7 @@ From 76b6c9aad473cbf592d5c1943c833c2ada46c300 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 16 Aug 2024 06:09:54 +0000 Subject: [PATCH 2/9] 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: Icaeac539f24f68560852e9822d89c3d552c3d7d0 Signed-off-by: Peter (YM) --- thermal_info_config_bluejay.json | 8 -------- thermal_info_config_charge_bluejay.json | 8 -------- 2 files changed, 16 deletions(-) diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json index 17b0eb0..a09197b 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -21,7 +21,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -39,7 +38,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -55,7 +53,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -71,7 +68,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -87,7 +83,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -112,7 +107,6 @@ "0.0", "0.0" ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -128,7 +122,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -144,7 +137,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, diff --git a/thermal_info_config_charge_bluejay.json b/thermal_info_config_charge_bluejay.json index 2ee436f..f19aa45 100644 --- a/thermal_info_config_charge_bluejay.json +++ b/thermal_info_config_charge_bluejay.json @@ -21,7 +21,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -39,7 +38,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -55,7 +53,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -71,7 +68,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -87,7 +83,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -112,7 +107,6 @@ "0.0", "0.0" ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -128,7 +122,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -144,7 +137,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, From 01b506e228013f223a81fe5aae148c06677ec413 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 12 Aug 2024 17:17:48 +0800 Subject: [PATCH 3/9] gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay Bug: 358041425 Test: verify pass Change-Id: I98f98bcfbdc1a306eca3ce25216a61ed436bcbfa --- gps.6.1.xml.b3 | 1 + gps.xml.b3 | 1 + gps_user.6.1.xml.b3 | 1 + gps_user.xml.b3 | 1 + 4 files changed, 4 insertions(+) diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3 index 18f5e65..7b68fcb 100644 --- a/gps.6.1.xml.b3 +++ b/gps.6.1.xml.b3 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/gps.xml.b3 b/gps.xml.b3 index 9ee4e24..25081c8 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3 index afa301b..fb8c15a 100644 --- a/gps_user.6.1.xml.b3 +++ b/gps_user.6.1.xml.b3 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index 74a7178..8d15786 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" From 7cc108b7b49a8fc046b66251db159f42752fa9b4 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 27 Aug 2024 06:57:59 +0000 Subject: [PATCH 4/9] gps: Re-enable GLO & QZSS in US Test: on-device Bug: 353579502 Change-Id: I2cb913ae5dae4bf62c7b11a98dcc429b186520c9 --- gps.6.1.xml.b3 | 3 +++ gps.xml.b3 | 3 +++ gps_user.6.1.xml.b3 | 2 ++ gps_user.xml.b3 | 2 ++ 4 files changed, 10 insertions(+) diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3 index 7b68fcb..9ab8fc6 100644 --- a/gps.6.1.xml.b3 +++ b/gps.6.1.xml.b3 @@ -57,6 +57,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" @@ -95,6 +96,8 @@ /> diff --git a/gps.xml.b3 b/gps.xml.b3 index 25081c8..11c0734 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -57,6 +57,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" @@ -95,6 +96,8 @@ /> diff --git a/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3 index fb8c15a..8679528 100644 --- a/gps_user.6.1.xml.b3 +++ b/gps_user.6.1.xml.b3 @@ -94,6 +94,8 @@ /> diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index 8d15786..d677aef 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -94,6 +94,8 @@ /> From 1eb4d583af80f24d6aca71bdc61c68a3f87f157d Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:32:25 +0000 Subject: [PATCH 5/9] 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: I1d77e050f607ac93fe45c9ba075c35274e1052f7 Signed-off-by: Robin Peng --- bluejay/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 6496ad0..bb3ab52 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -43,6 +43,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/bluejay/proprietary/BoardConfigVendor.mk $(call soong_config_set,google3a_config,target_device,bluejay) From c787f48091ce3a2dd64f00dc858f915747fe7933 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:20:33 +0000 Subject: [PATCH 6/9] Update product id for bluejay Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I403b2eea2dbf170209157aba3b44945b3fff9bc8 --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 079bd7b..7c70b6e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -309,5 +309,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Bluejay: 0x4108 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20488 + bluetooth.device_id.product_id=16648 From bc19c19239b1e023de5760ec9c44925242d399f1 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:51:09 +0800 Subject: [PATCH 7/9] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass Change-Id: I7a1ff29ea0f18c2d339091aaec5b723fa7fdbf17 --- gps.6.1.xml.b3 | 2 +- gps.xml.b3 | 2 +- gps_user.6.1.xml.b3 | 2 +- gps_user.xml.b3 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3 index 9ab8fc6..555522f 100644 --- a/gps.6.1.xml.b3 +++ b/gps.6.1.xml.b3 @@ -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/gps.xml.b3 b/gps.xml.b3 index 777f50a..ce53e8c 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -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/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3 index 8679528..484dd89 100644 --- a/gps_user.6.1.xml.b3 +++ b/gps_user.6.1.xml.b3 @@ -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/gps_user.xml.b3 b/gps_user.xml.b3 index 7b4ce7a..35e76aa 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -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 34289b872cef50619b8e09741bf6e635a8c74545 Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Tue, 24 Sep 2024 12:09:39 +0000 Subject: [PATCH 8/9] powerhint: fix json syntax for wbs test Bug: 369322087 Change-Id: I31c1fa64b9904e7ba2223f370e5040ffcd2c3201 Test: boot to home Flag: EXEMPT powerhint does not support flag --- powerhint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index d978ba9..4fcdb12 100644 --- a/powerhint.json +++ b/powerhint.json @@ -328,7 +328,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "LimitFlashCurrent", From cff96f4dad77e2e2981dd3f486d4a2adcbed1c0e Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 25 Sep 2024 06:24:57 +0000 Subject: [PATCH 9/9] 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: Ib56940afcc061b9c8dcce60a2da7822a7d23973a --- device-bluejay.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 7c70b6e..ad5fd58 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -36,7 +36,6 @@ include device/google/bluejay-sepolicy/bluejay-sepolicy.mk include device/google/bluejay/audio/bluejay/audio-tables.mk include device/google/gs101/device-shipping-common.mk include device/google/gs101/telephony/pktrouter.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk