From 18d6f6b4dffa676ee0e8748bca0a0113976bb34a Mon Sep 17 00:00:00 2001 From: Nikhil Bhanu Date: Thu, 1 Feb 2024 12:41:43 -0800 Subject: [PATCH 1/6] Audio: Enabled stereo spatialization property for comet Bug: 323223919 Test: manual - Tested enable/disable behavior on shiba Test: manual - Playback stereo content with spatial audio enabled Change-Id: Iffeb527ff42542c7be00cdb487bafbf1d674a5e1 --- device-comet.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-comet.mk b/device-comet.mk index eb1e806..5bd4856 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -185,6 +185,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_transaural_enabled_default=false \ persist.vendor.audio.spatializer.speaker_enabled=true +# declare use of stereo spatialization +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.stereo_spatialization_enabled=true + # Sound Dose PRODUCT_PACKAGES += \ android.hardware.audio.sounddose-vendor-impl \ From 4e5c91eeaf180edcaf30fb2f1f0a27003ab990c7 Mon Sep 17 00:00:00 2001 From: James Huang Date: Tue, 20 Feb 2024 18:39:32 +0800 Subject: [PATCH 2/6] 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: I567bc78984d9247ddf58fe579aa6ddbcd36436e1 --- location/user/gps.cfg | 2 ++ location/userdebug/gps.cfg | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 3c1c8a8..9f54011 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -57,6 +57,8 @@ RfPathLossDb_Ap=3600 RfPathLossDb_Cp=3600 RfPathLossDb_L5_Ap=4300 RfPathLossDb_L5_Cp=4300 +IsUseEntireRespTime911=1 +isForceHighAccuracyMode=1 isUseUncalAccel=0 GNSS_CARRIER_CONFIG_BEGIN diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 23d4075..50e03df 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -181,6 +181,12 @@ RfPathLossDb_Ap=3600 RfPathLossDb_Cp=3600 RfPathLossDb_L5_Ap=4300 RfPathLossDb_L5_Cp=4300 +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 bdd387ef400dc128219290365b9b2d0b9760a5e1 Mon Sep 17 00:00:00 2001 From: John Pan Date: Tue, 20 Feb 2024 15:41:10 +0800 Subject: [PATCH 3/6] Don't use default wallpaper when factory build Bug: 325990173 Test: Build pass; Manual Change-Id: I59229cb7bb3bd5fce4d3b5437718a35cc74f25cc --- device-comet.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/device-comet.mk b/device-comet.mk index 32cae1e..8b19b2e 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -29,10 +29,13 @@ $(call inherit-product-if-exists, vendor/google_devices/comet/prebuilts/device-v $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/WallpapersComet.mk) $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/comet/device-vendor-comet.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) +ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),) + $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/WallpapersComet.mk) +endif + DEVICE_PACKAGE_OVERLAYS += device/google/comet/comet/overlay ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) From c12fbfbd414688ad47811d36f7643a48f4197268 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Wed, 21 Feb 2024 16:52:33 +0000 Subject: [PATCH 4/6] Revert "thermal: Update hotThresholds" This reverts commit fb839117d6126fac5b5948ac9a9a965f752b5663. Reason for revert: Probable culprit for b/326235335. Will be verifying through ABTD for confirmation and before submitting the revert. Change-Id: Ie82a56007090386c5f4425b3495fc8ccfdfc884c --- thermal/thermal_info_config_charge_comet.json | 2 +- thermal/thermal_info_config_comet.json | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json index 53d3b8e..1fb655d 100644 --- a/thermal/thermal_info_config_charge_comet.json +++ b/thermal/thermal_info_config_charge_comet.json @@ -107,7 +107,7 @@ "Combination": ["VIRTUAL-SKIN-CHARGE-OPEN", "VIRTUAL-SKIN-CHARGE-CLOSE"], "Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"], "CoefficientType": ["SENSOR", "SENSOR"], - "HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0], + "HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier": 0.001, "PollingDelay": 300000, diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 50aaba7..6ce0082 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -142,7 +142,7 @@ "Combination": ["VIRTUAL-SKIN-OPEN", "VIRTUAL-SKIN-CLOSE"], "Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"], "CoefficientType": ["SENSOR", "SENSOR"], - "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 100.0, 140.0], "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier": 0.001, "PollingDelay": 300000, @@ -168,7 +168,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0], + "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier": 0.001, "SendPowerHint": true, @@ -327,7 +327,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 41.0, 43.0, 53.0, "NAN", "NAN", "NAN"], + "HotThreshold": ["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"], "HotHysteresis": [0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0], "Multiplier": 0.001, "PollingDelay": 300000, @@ -430,7 +430,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0], + "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier": 0.001, "PollingDelay": 300000, @@ -494,7 +494,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 43.0, 45.0, 46.5, 53.0, "NAN", "NAN"], + "HotThreshold": ["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"], "HotHysteresis": [0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0], "Multiplier": 0.001, "PollingDelay": 300000, @@ -526,7 +526,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"], + "HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", 138.0, "NAN"], "HotHysteresis": [0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier": 0.001, "PollingDelay": 300000, @@ -542,7 +542,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0], + "HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier": 0.001, "PollingDelay": 300000, From 259d71f4d3ae2642555aac647ed8850f8f41eb48 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Thu, 22 Feb 2024 08:28:57 +0800 Subject: [PATCH 5/6] thermal: Update hotThresholds Update emergency and shutdown threshold values to align with previous generation foldable device. Bug: 303547512 Bug: 322147413 Test: Build and verify lshal and use emul_temp to trigger shutdown Change-Id: I3229de36dafcff7fdb29a6f1dd014bd49324c285 --- thermal/thermal_info_config_charge_comet.json | 4 ++-- thermal/thermal_info_config_comet.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json index 1fb655d..ec48317 100644 --- a/thermal/thermal_info_config_charge_comet.json +++ b/thermal/thermal_info_config_charge_comet.json @@ -107,8 +107,8 @@ "Combination": ["VIRTUAL-SKIN-CHARGE-OPEN", "VIRTUAL-SKIN-CHARGE-CLOSE"], "Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"], "CoefficientType": ["SENSOR", "SENSOR"], - "HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], - "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], + "HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0], + "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.4, 1.9], "Multiplier": 0.001, "PollingDelay": 300000, "PassiveDelay": 7000, diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 6ce0082..3c81577 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -142,7 +142,7 @@ "Combination": ["VIRTUAL-SKIN-OPEN", "VIRTUAL-SKIN-CLOSE"], "Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"], "CoefficientType": ["SENSOR", "SENSOR"], - "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 100.0, 140.0], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier": 0.001, "PollingDelay": 300000, @@ -168,7 +168,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier": 0.001, "SendPowerHint": true, @@ -327,7 +327,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"], + "HotThreshold": ["NAN", 41.0, 43.0, 53.0, "NAN", "NAN", "NAN"], "HotHysteresis": [0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0], "Multiplier": 0.001, "PollingDelay": 300000, @@ -430,7 +430,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier": 0.001, "PollingDelay": 300000, @@ -494,7 +494,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"], + "HotThreshold": ["NAN", 43.0, 45.0, 46.5, 53.0, "NAN", "NAN"], "HotHysteresis": [0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0], "Multiplier": 0.001, "PollingDelay": 300000, @@ -526,7 +526,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", 138.0, "NAN"], + "HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"], "HotHysteresis": [0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier": 0.001, "PollingDelay": 300000, @@ -542,8 +542,8 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], - "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], + "HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0], + "HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.4, 1.9], "Multiplier": 0.001, "PollingDelay": 300000, "PassiveDelay": 7000, From 7e859d101a81b015f1be27ebe091231dd2691e30 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Thu, 22 Feb 2024 11:42:24 +0800 Subject: [PATCH 6/6] audio: reduce pull duration for speaker power Bug: 326161303 Test: manual test b/326161303#comment7 Change-Id: I0d74c6a53674199257d593392a5969d66314b61d Signed-off-by: Jasmine Cha --- audio/comet/aidl_config/audio_platform_configuration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml index 5760eb7..6ac935a 100644 --- a/audio/comet/aidl_config/audio_platform_configuration.xml +++ b/audio/comet/aidl_config/audio_platform_configuration.xml @@ -25,7 +25,7 @@ - +