From 424eff53802ca2c15a27930c56fcd645d84e1510 Mon Sep 17 00:00:00 2001
From: Poomarin Phloyphisut <poomarin@google.com>
Date: Wed, 28 Jun 2023 10:30:13 +0000
Subject: [PATCH 1/3] pixelstats: add pcm_latency and pcm_count sysfs for
 VendorAudioPcmStatsReported

Bug: 280248990
Test: Local Test
Change-Id: I0b476417bd14972681c7ea7fb18ddff2aa8ed4ee
---
 pixelstats/service.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index e63ba0f5..d5adf94d 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -91,7 +91,10 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     .PDMStatePath = "/sys/devices/platform/audiometrics/pdm_state",
     .WavesPath = "/sys/devices/platform/audiometrics/waves",
     .AdaptedInfoCountPath = "/sys/devices/platform/audiometrics/adapted_info_active_count",
-    .AdaptedInfoDurationPath = "/sys/devices/platform/audiometrics/adapted_info_active_duration"
+    .AdaptedInfoDurationPath = "/sys/devices/platform/audiometrics/adapted_info_active_duration",
+    .CCARatePath = "/sys/devices/platform/audiometrics/cca_rate_read_once",
+    .PcmLatencyPath = "/sys/devices/platform/audiometrics/pcm_latency",
+    .PcmCountPath = "/sys/devices/platform/audiometrics/pcm_count"
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {

From ac0481adbb59b244e3147593115bde93e79c8a5d Mon Sep 17 00:00:00 2001
From: qinyiyan <qinyiyan@google.com>
Date: Thu, 6 Jul 2023 17:17:36 -0700
Subject: [PATCH 2/3] Use version 1 of the DBA service, since version 1 is the
 only frozen version. bug:290377605

Change-Id: I24efad6229c94d8fe455aa6b738f00bf5d2b1b91
---
 device_framework_matrix_product.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 26745316..7daa9988 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -124,7 +124,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>com.google.edgetpu.dba</name>
-        <version>2</version>
+        <version>1</version>
         <interface>
             <name>IDevice</name>
             <instance>default</instance>

From 6508bcaf16e31d751a4e44052e853bfb1d9e415f Mon Sep 17 00:00:00 2001
From: Lisa Liu <liulisa@google.com>
Date: Tue, 11 Jul 2023 14:27:01 +0000
Subject: [PATCH 3/3] init: restore preferred idle setting when boot completed

Restore preferred_idle_mask on boot_completed.

Bug: 284039815
Bug: 290724986
Test: pts-tradefed run singleCommand pts -m PtsPerformanceTestCases -t com.google.android.perf.pts.BootPerformanceTest
Change-Id: Id174a2ad02e5bd1e2adcdd2e78d06090c7f626e9
---
 conf/init.zuma.rc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index d4556a70..7391254c 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -794,6 +794,17 @@ on property:sys.boot_completed=1
     # Cancel boot devfreq
     write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1
 
+    # Restore prefer idle
+    write /proc/vendor_sched/ta_preferred_idle_mask_low 0x1ff
+    write /proc/vendor_sched/ta_preferred_idle_mask_mid 0x1ff
+    write /proc/vendor_sched/ta_preferred_idle_mask_high 0x1ff
+    write /proc/vendor_sched/fg_preferred_idle_mask_low 0x1ff
+    write /proc/vendor_sched/fg_preferred_idle_mask_mid 0x1ff
+    write /proc/vendor_sched/fg_preferred_idle_mask_high 0x1ff
+    write /proc/vendor_sched/sys_preferred_idle_mask_low 0x1ff
+    write /proc/vendor_sched/sys_preferred_idle_mask_mid 0x1ff
+    write /proc/vendor_sched/sys_preferred_idle_mask_high 0x1ff
+
     # Setup final cpuset
     write /dev/cpuset/top-app/cpus 0-8
     write /dev/cpuset/foreground/cpus 0-7