From ff2f8cb776b3d00373681aee8b141f110b084b34 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Wed, 21 Feb 2024 03:54:38 +0000 Subject: [PATCH 1/3] audio: fix vts for microphone information. note: Depending the realized in framework side, the microhone information only report the corresponding devices info surfaced via SDK. That means reporting bottom / back mic are necessary. Test: atest VtsHalAudioCoreTargetTest Bug: 300735639 Change-Id: I1dcc744d21d909a95dfcad27c7f745b1081dabe2 --- .../audio_platform_configuration.xml | 206 ++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml index 5760eb7..e64fa26 100644 --- a/audio/comet/aidl_config/audio_platform_configuration.xml +++ b/audio/comet/aidl_config/audio_platform_configuration.xml @@ -113,6 +113,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 060cb979fccf382be94789650bedde799dd234ff Mon Sep 17 00:00:00 2001 From: Charlotte Lu Date: Wed, 21 Feb 2024 12:56:58 +0800 Subject: [PATCH 2/3] Add SettingsCometOverlay Test: Visual Test Fix:317149063 Change-Id: I683c9685b43f5c15dee2a7e5dee1150b3e656f8e --- device-comet.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-comet.mk b/device-comet.mk index 7d970c3..9ceee10 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -244,6 +244,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ GRilServiceOverlay_CT3 +# Settings Overlay +PRODUCT_PACKAGES += \ + SettingsCometOverlay + # Graphics PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.set_idle_timer_ms_4619827677550801152=80 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.support_kernel_idle_timer_4619827677550801152=true From fb839117d6126fac5b5948ac9a9a965f752b5663 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Wed, 21 Feb 2024 17:50:44 +0800 Subject: [PATCH 3/3] 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: Ia98dc74d5964868fa893ef1badfe0f5e37093e40 --- 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 1fb655d..53d3b8e 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, 47.0, 55.0], + "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.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 6ce0082..50aaba7 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,7 +542,7 @@ "Formula": "MAXIMUM", "Combination": ["VIRTUAL-SKIN"], "Coefficient": [1.0], - "HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "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.9, 1.9], "Multiplier": 0.001, "PollingDelay": 300000,