From 7dbd2bd8c029fa3e35d0ebfd141c0d0ca0a6a470 Mon Sep 17 00:00:00 2001 From: Nathan Kulczak Date: Tue, 28 May 2024 20:55:27 +0000 Subject: [PATCH 1/6] tegu: Enable all primitives Remove supported_primitives property so that all primitives will be enabled by fallback Bug: 342292981 Test: idlcli and atest suites Change-Id: I6b83364867d06cfa8d4fbbe434518dcc0f258f9c Signed-off-by: Nathan Kulczak --- device-tegu.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device-tegu.mk b/device-tegu.mk index 44a8194..3c6817d 100644 --- a/device-tegu.mk +++ b/device-tegu.mk @@ -284,7 +284,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.supported_primitives=243 \ ro.vendor.vibrator.hal.f0.comp.enabled=1 \ ro.vendor.vibrator.hal.redc.comp.enabled=0 \ persist.vendor.vibrator.hal.context.enable=false \ From 1dd20df4df608cf6974a8453ebd3ca9c480f7507 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 19 Jun 2024 09:03:08 +0000 Subject: [PATCH 2/6] thermal: use stats-updator to trigger virtual sensor and remove unused virtual sensor - Use stats-updator to ensure all the virutal sensor we want to monitor can be trigger at the same time. - Remove the un-used virtual sensor - Update the name of VSKIN-SKIN-UNDER-52 to avoid confusion Bug: 333834000 Test: Build on device and boot to home, b/333834000#comment8 Flag: EXEMPT (bug 337358613) Change-Id: I9fc4df066b17417cee412d776a118ea1935fbc34 Signed-off-by: Peter (YM) --- thermal/thermal_info_config_tegu.json | 64 +++++++-------------------- 1 file changed, 16 insertions(+), 48 deletions(-) diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json index 16b2d91..aa6f5c0 100644 --- a/thermal/thermal_info_config_tegu.json +++ b/thermal/thermal_info_config_tegu.json @@ -180,7 +180,6 @@ "Version":"2.0", "VirtualSensor":true, "Formula":"MAXIMUM", - "TriggerSensor": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"], "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"], "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier": 0.001 @@ -680,50 +679,6 @@ "Multiplier":0.001, "SendCallback":true }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.04, 0.03, 0.1, 0.05, 0.35, 0.3, 0, 0, 0.04], - "Offset":1850, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0.35, 0.22, 0.22, 0.07, 0.03, 0, 0], - "Offset":-560, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.05, 0.13, 0.12, 0.07, 0.37, 0.06, 0.01, 0.01, 0], - "Offset":5070, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT", - "Type":"UNKNOWN", - "Version":"1.0", - "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], - "Coefficient":[1, 1, 1], - "Multiplier":0.001 - }, { "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", "Type": "UNKNOWN", @@ -867,10 +822,9 @@ "PassiveDelay":7000 }, { - "Name":"VSKIN-SKIN-OVER-52", + "Name":"VSKIN-SKIN-UNDER-52", "Type":"UNKNOWN", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"COUNT_THRESHOLD", "Combination":["VIRTUAL-SKIN"], "Coefficient":[-52000], @@ -883,10 +837,24 @@ "Formula":"WEIGHTED_AVG", "Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000], "CombinationType":["SENSOR", "SENSOR", "CONSTANT"], - "Coefficient":[1, -1, "VSKIN-SKIN-OVER-52"], + "Coefficient":[1, -1, "VSKIN-SKIN-UNDER-52"], "CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"], "Multiplier":0.001 }, + { + "Name": "STATS-UPDATOR", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "QUIET_THERM-MODEL-DIFF-DURING-MODEL-OVER-52", "VSKIN-SKIN-UNDER-52"], + "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0], + "Multiplier": 1, + "SendPowerHint": true, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, { "Name":"LITTLE", "Type":"CPU", From eb3560f0679fcfa02b79dd0bdf4e18cd6e8a036d Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Fri, 14 Jun 2024 12:10:23 +0800 Subject: [PATCH 3/6] gps: update gps 4.13.3_1 Bug: 333849828 Test: b/347129137 atest CtsLocationGnssTestCases atest VtsHalGnssTargetTest Change-Id: I1f6b0a387f58719e9c2e51ed5c45dfda6ff37383 --- location/gps.cfg | 7 ++++++- location/gps_user.cfg | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/location/gps.cfg b/location/gps.cfg index 205dc74..57bc31e 100644 --- a/location/gps.cfg +++ b/location/gps.cfg @@ -24,6 +24,9 @@ gnss_device_type=K041 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + # send debug req on MCW oddity #Chip_Configuration_Io_Options=0x85 @@ -113,6 +116,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled (default), 1 = Enabled Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# MTPL: 0 = Disabled, 1 = Enabled (default) +Chip_Configuration_FeatureCfg_MTPL=0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -121,7 +126,7 @@ Chip_Configuration_FeatureCfg_DFS = 1 # CHUB = 0x8 # The CHUB on the neus continually triggers a bit so this is to prevent # it from continually waking the gnss. -mailboxDisabled=0x8 +mailboxDisabled=0x0 ### Specify RFIC ID for K40 ### # 55200001 = S5520 EVT1 diff --git a/location/gps_user.cfg b/location/gps_user.cfg index 67c00bb..35e7ee6 100644 --- a/location/gps_user.cfg +++ b/location/gps_user.cfg @@ -10,6 +10,7 @@ caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK gnss_device_type=K041 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +Is1PPSTimeSyncEnable=0 Chip_Configuration_Dynamic_HSI=0 Chip_Configuration_ubsan_opt=1 GlueLayer_IsPlatformRefTimeEnable=1 @@ -36,7 +37,8 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 -mailboxDisabled=0x8 +Chip_Configuration_FeatureCfg_MTPL=0 +mailboxDisabled=0x0 gnss_rfic_chip_id=55200001 UseRtcForAiding=1 rtc_min_num_of_fixes=10 From 387cd61a6f35b42c631e01e3ee89422a30f15fd8 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Thu, 20 Jun 2024 07:31:40 +0000 Subject: [PATCH 4/6] audio: Phase in Waves mps in TG4 1. This mps file version modify Portrait and Landscape 1st~24th volume sound quality. 2. This is the EVT first version to make 1st~24th volume sound quality. 3. This file internal name: TG4_EVT_Release_20240618_tune4.mps Files from the latest attachment on b/348309503 Bug: 348309503 Test: verified by supery@ Flag: NONE tuning table for existed feature Change-Id: Ic50d336cab63224e2295727d49c21295138b3502 --- audio/tegu/tuning/waves/waves_preset.mps | Bin 173601 -> 175605 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/tegu/tuning/waves/waves_preset.mps b/audio/tegu/tuning/waves/waves_preset.mps index 1ef5fd76ecede0e7cfd431511bc2f1b5471c7f6e..19aa4b8d34657970c88d43cfba6fbd56905587bb 100644 GIT binary patch delta 2535 zcmZ2@hU@EXE;gqCN8h(=C$jxzws^Z{GaI8dI|~Z~!-2_q;mSaoAz^d^EOfu-50Cq|V61Ai%)zWV@yS zqZp=X)$E%u#QkQ58To(lqoCKQM*>9RjqA;R6?t0D=WT%mKtcnR%&+MGOqA zKsE#@xiB!;xiC0H0qH82v@|vc5I+2s!y%?$3Cw0-{ICazUi$zwAe*@u$VWC4D-9ZWy`)o6*dIJFwx0GXn!K6rmvqw7&uDTaYzC zupemn0hkM8fC4~s;0|1fW+)p-2ME9nMRKUIv9JROpFQJaKWpa9eL#9YkPkO|o+>aE zDKKo_Sh_ffk_5Sfee>)Wt?Hmu$vmi2WtHRU$c%@>Gf4ffS}n zh@rGel@POmsgfC(Dz_gqWjyeQvs{yt36#7!w)Yz`nP8T5B$S)9De27l7|r?gsg$N5 zhEX?7AvuupG=<%P6s9SNp|nX;5VI>aIhjF;h=Bu0F)~O`pWnzNx?L}dNqP{bD5G{p tqxOYVN>LEQsGFjY97uVJ!tOu{QxwEd+N3Cm+5IY5WWXDgZi`6b1kQ delta 329 zcmex*n`_}2E;gqCM_ Date: Thu, 20 Jun 2024 08:34:43 +0000 Subject: [PATCH 5/6] audio: Phase in audio_policy_volume.xml in TG4 1. This audio_policy_volume.xml with TG4_EVT_Release_20240618_tune4.mps 2. With above two files, final speaker playback volume curve from 1st~25th is the same as AK3 3. internal file name: audio_policy_volumes_EVT_03.xml Files from the latest attachment on b/348312267 Bug: 348312267 Test: verified by supery@ Flag: NONE library update for existed feature Change-Id: I0eeff0af4dca20454a1e350939321d832b0250ff --- .../tegu/aidl_config/audio_policy_volumes.xml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/audio/tegu/aidl_config/audio_policy_volumes.xml b/audio/tegu/aidl_config/audio_policy_volumes.xml index 1451d0a..1f7ceda 100644 --- a/audio/tegu/aidl_config/audio_policy_volumes.xml +++ b/audio/tegu/aidl_config/audio_policy_volumes.xml @@ -69,7 +69,7 @@ sync from ag/26090783, need remove before submit. - 1,-4000 + 1,-4200 33,-2400 66,-1200 100,0 @@ -83,30 +83,30 @@ sync from ag/26090783, need remove before submit. - 1,-6589 - 8,-5971 - 12,-5619 - 16,-5212 - 20,-4833 - 24,-4434 - 28,-4141 - 32,-3856 - 36,-3611 - 40,-3382 - 44,-3143 - 48,-2921 - 52,-2695 - 56,-2497 - 60,-2308 - 64,-2109 - 68,-1893 - 72,-1706 - 76,-1474 - 80,-1224 - 84,-1000 - 88,-786 - 92,-581 - 96,-275 + 1,-6799 + 8,-6157 + 12,-5810 + 16,-5386 + 20,-5014 + 24,-4563 + 28,-4251 + 32,-3946 + 36,-3724 + 40,-3463 + 44,-3193 + 48,-2976 + 52,-2743 + 56,-2518 + 60,-2354 + 64,-2112 + 68,-1912 + 72,-1697 + 76,-1467 + 80,-1222 + 84,-1010 + 88,-791 + 92,-550 + 96,-260 100,0 - 1,-4800 + 1,-5200 33,-2400 66,-1200 100,0 @@ -190,10 +190,10 @@ sync from ag/26090783, need remove before submit. 100,-1800 - 1,-6000 - 33,-3000 - 66,-2200 - 100,-1600 + 1,-6200 + 33,-3200 + 66,-2400 + 100,-1800 From 71e4001012dc41c67af61117f272be6d2cf1fdf3 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Wed, 19 Jun 2024 02:28:34 +0000 Subject: [PATCH 6/6] gps: Enable Pps function Bug: 348095246 Test: b/348095246#comment1 time sync logs. Change-Id: I92a74d5b93d27d75b4d1e0a5cdc1abac547a4657 --- device-tegu.mk | 2 ++ location/gps.cfg | 2 +- location/gps_user.cfg | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-tegu.mk b/device-tegu.mk index 7e665ca..12d6d74 100644 --- a/device-tegu.mk +++ b/device-tegu.mk @@ -269,6 +269,8 @@ PRODUCT_SOONG_NAMESPACES += \ # Location include device/google/tegu/location/device-gnss.mk +# For GPS property +PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true diff --git a/location/gps.cfg b/location/gps.cfg index 57bc31e..e6187cd 100644 --- a/location/gps.cfg +++ b/location/gps.cfg @@ -25,7 +25,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin # Enable/Disable 1PPS Time Sync policy -Is1PPSTimeSyncEnable=0 +Is1PPSTimeSyncEnable=1 # send debug req on MCW oddity #Chip_Configuration_Io_Options=0x85 diff --git a/location/gps_user.cfg b/location/gps_user.cfg index 35e7ee6..c3ced93 100644 --- a/location/gps_user.cfg +++ b/location/gps_user.cfg @@ -10,7 +10,7 @@ caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK gnss_device_type=K041 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin -Is1PPSTimeSyncEnable=0 +Is1PPSTimeSyncEnable=1 Chip_Configuration_Dynamic_HSI=0 Chip_Configuration_ubsan_opt=1 GlueLayer_IsPlatformRefTimeEnable=1