From 5740c8878aa856e0051af6eb187891d4b10896eb Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 6 Mar 2024 15:04:50 -0800 Subject: [PATCH 1/5] caiman: Remove importing init.etm.rc init.etm.rc can be imported automatically by put it in /vendor/etc/init. Bug: 321061072 Test: build and run Change-Id: I3df407190d2777b52bcdf224d45f232aada89e49 --- conf/init.caiman.rc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc index 2ef3673a..d33ed77c 100644 --- a/conf/init.caiman.rc +++ b/conf/init.caiman.rc @@ -71,10 +71,3 @@ on property:sys.boot_completed=1 chown system input /dev/touch_offload chmod 660 /dev/touch_offload start twoshay - -# ETM -on init && property:ro.build.flavor=caiman-userdebug - import /vendor/etc/init/hw/init.etm.rc - -on init && property:ro.build.flavor=caiman-eng - import /vendor/etc/init/hw/init.etm.rc From 45a646dcc47148b3872a408d7340edb8c1b972f4 Mon Sep 17 00:00:00 2001 From: millerliang Date: Tue, 12 Mar 2024 07:27:21 +0000 Subject: [PATCH 2/5] audio: adjust the latency value for av sync Bug: 328473598 Test: Camera recording, Video playback Change-Id: Iefc4498b4e7977d054266cbc32ccff7078858f2d Signed-off-by: millerliang --- .../aidl_config/audio_platform_configuration.xml | 12 +++++++----- .../aidl_config/audio_platform_configuration.xml | 12 +++++++----- .../aidl_config/audio_platform_configuration.xml | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/audio/caiman/aidl_config/audio_platform_configuration.xml b/audio/caiman/aidl_config/audio_platform_configuration.xml index 649aed21..8eb240a7 100644 --- a/audio/caiman/aidl_config/audio_platform_configuration.xml +++ b/audio/caiman/aidl_config/audio_platform_configuration.xml @@ -81,8 +81,8 @@ - - + + @@ -96,9 +96,11 @@ - - - + + + + + diff --git a/audio/komodo/aidl_config/audio_platform_configuration.xml b/audio/komodo/aidl_config/audio_platform_configuration.xml index 649aed21..8eb240a7 100644 --- a/audio/komodo/aidl_config/audio_platform_configuration.xml +++ b/audio/komodo/aidl_config/audio_platform_configuration.xml @@ -81,8 +81,8 @@ - - + + @@ -96,9 +96,11 @@ - - - + + + + + diff --git a/audio/tokay/aidl_config/audio_platform_configuration.xml b/audio/tokay/aidl_config/audio_platform_configuration.xml index 649aed21..8eb240a7 100644 --- a/audio/tokay/aidl_config/audio_platform_configuration.xml +++ b/audio/tokay/aidl_config/audio_platform_configuration.xml @@ -81,8 +81,8 @@ - - + + @@ -96,9 +96,11 @@ - - - + + + + + From 54eb81e993b3c2d9879eea91441251257ac3c4a5 Mon Sep 17 00:00:00 2001 From: Jiaming Liu Date: Tue, 12 Mar 2024 08:25:39 +0000 Subject: [PATCH 3/5] Enable WM extensions on caiman and komomdo Bug: 325321407 Test: Build Change-Id: I1fc9e40f569c84641f5d1d714f24f11f391c9726 --- device-caiman.mk | 3 +++ device-komodo.mk | 3 +++ device-tokay.mk | 3 +++ 3 files changed, 9 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index a6933a71..aec3d54b 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -391,3 +391,6 @@ endif # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.server.automatic_turn_on=true + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-komodo.mk b/device-komodo.mk index 2475fd00..37932684 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -387,3 +387,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.server.automatic_turn_on=true + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-tokay.mk b/device-tokay.mk index 0be4fe60..8ed2f8d4 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -357,3 +357,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.server.automatic_turn_on=true + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From 439a40fa3754e1fa2c9ff588ef3efe939c6e10b8 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Wed, 13 Mar 2024 02:01:28 +0000 Subject: [PATCH 4/5] [USB Audio AIDL] Add mixer path for "usb-device-microphones" Bug: 329147872 Test: Local test Change-Id: I96bc9736ba37837b22d184777046f5e0084b4570 --- audio/caiman/aidl_config/mixer_paths_aidl.xml | 10 +++++++++- audio/komodo/aidl_config/mixer_paths_aidl.xml | 10 +++++++++- audio/tokay/aidl_config/mixer_paths_aidl.xml | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml index 638fb6a4..7f14007e 100644 --- a/audio/caiman/aidl_config/mixer_paths_aidl.xml +++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml @@ -1392,13 +1392,21 @@ - + + + + + + + + + diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml index 638fb6a4..7f14007e 100644 --- a/audio/komodo/aidl_config/mixer_paths_aidl.xml +++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml @@ -1392,13 +1392,21 @@ - + + + + + + + + + diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml index 638fb6a4..7f14007e 100644 --- a/audio/tokay/aidl_config/mixer_paths_aidl.xml +++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml @@ -1392,13 +1392,21 @@ - + + + + + + + + + From a6b5f7acc48d10fdc0733936628affc8359f966e Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Wed, 13 Mar 2024 11:54:43 +0800 Subject: [PATCH 5/5] powerstats: use display VRR power stats on specific devices Bug: 329201432 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I77d49f87929a7e534576f3a6d77fc820172f7f93 Signed-off-by: Darren Hsu --- powerstats/caiman/service.cpp | 33 +-------------------------------- powerstats/komodo/service.cpp | 33 +-------------------------------- 2 files changed, 2 insertions(+), 64 deletions(-) diff --git a/powerstats/caiman/service.cpp b/powerstats/caiman/service.cpp index 3ed20dd5..acf90cd3 100644 --- a/powerstats/caiman/service.cpp +++ b/powerstats/caiman/service.cpp @@ -33,38 +33,6 @@ using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { - // Add display residency stats - struct stat buffer; - if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) { - // time_in_state exists - addDisplayMrr(p); - } else { - // time_in_state doesn't exist - std::vector states = { - "Off", - "LP: 960x2142@1", - "LP: 960x2142@30", - "On: 960x2142@1", - "On: 960x2142@30", - "On: 960x2142@60", - "On: 960x2142@120", - "HBM: 960x2142@60", - "HBM: 960x2142@120", - "LP: 1280x2856@1", - "LP: 1280x2856@30", - "On: 1280x2856@1", - "On: 1280x2856@30", - "On: 1280x2856@60", - "On: 1280x2856@120", - "HBM: 1280x2856@60", - "HBM: 1280x2856@120"}; - - p->addStateResidencyDataProvider(std::make_unique( - "Display", - "/sys/class/backlight/panel0-backlight/state", - states)); - } - // Add display energy consumer p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( p, @@ -81,6 +49,7 @@ int main() { std::shared_ptr p = ndk::SharedRefBase::make(); + addDisplayVrr(p, "Display"); addZumaProCommonDataProviders(p); addDisplay(p); diff --git a/powerstats/komodo/service.cpp b/powerstats/komodo/service.cpp index 2d873333..acf90cd3 100644 --- a/powerstats/komodo/service.cpp +++ b/powerstats/komodo/service.cpp @@ -33,38 +33,6 @@ using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { - // Add display residency stats - struct stat buffer; - if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) { - // time_in_state exists - addDisplayMrr(p); - } else { - // time_in_state doesn't exist - std::vector states = { - "Off", - "LP: 1008x2244@1", - "LP: 1008x2244@30", - "On: 1008x2244@1", - "On: 1008x2244@30", - "On: 1008x2244@60", - "On: 1008x2244@120", - "HBM: 1008x2244@60", - "HBM: 1008x2244@120", - "LP: 1344x2992@1", - "LP: 1344x2992@30", - "On: 1344x2992@1", - "On: 1344x2992@30", - "On: 1344x2992@60", - "On: 1344x2992@120", - "HBM: 1344x2992@60", - "HBM: 1344x2992@120"}; - - p->addStateResidencyDataProvider(std::make_unique( - "Display", - "/sys/class/backlight/panel0-backlight/state", - states)); - } - // Add display energy consumer p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( p, @@ -81,6 +49,7 @@ int main() { std::shared_ptr p = ndk::SharedRefBase::make(); + addDisplayVrr(p, "Display"); addZumaProCommonDataProviders(p); addDisplay(p);