From a4b4967c038aad263bc75f9248a7850355af62a1 Mon Sep 17 00:00:00 2001
From: Spade Lee <spadelee@google.com>
Date: Tue, 12 Mar 2024 16:51:28 +0000
Subject: [PATCH 1/3] pixelstats: zuma: add history validation path

Bug: 329174074
Change-Id: Ia134e6b6b8dc0c9db35bcf36bed700b67466f353
Signed-off-by: Spade Lee <spadelee@google.com>
---
 pixelstats/service.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 718fb82c..89348a50 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -128,7 +128,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
         "/sys/devices/platform/hdcp/hdcp1_success_count",
         "/sys/devices/platform/hdcp/hdcp1_fail_count",
         "/sys/devices/platform/hdcp/hdcp0_count",
-    }
+    },
+    .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor"
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {

From b80719b25f9e6e4177d9d43352aadc1aa2b52053 Mon Sep 17 00:00:00 2001
From: Wesley Lee <szuweilee@google.com>
Date: Wed, 10 Jan 2024 16:44:36 -0800
Subject: [PATCH 2/3] Adjust 720P and below performance point

Bug: 325950790

Change-Id: I3038b4056819e55fff9171f809ff66d6ada969ab
Signed-off-by: Wesley Lee <szuweilee@google.com>
---
 media_codecs_bo_c2.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 443c27e4..2ae83ba7 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -57,10 +57,10 @@
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="61200" />
             <Limit name="bitrate" range="1-120000000" />
-            <Limit name="performance-point-1280x720" range="240" />
+            <Limit name="performance-point-1280x720"  value="200" />
             <Limit name="performance-point-1920x1080" value="180" />
             <Limit name="performance-point-1920x1079" value="120" />
-            <Limit name="performance-point-3840x2160" range="60" />
+            <Limit name="performance-point-3840x2160" value="60" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>

From 40f89b2d464071389d395f39928ef0e6d99bf2fb Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Fri, 22 Mar 2024 21:33:35 +0800
Subject: [PATCH 3/3] Update health AIDL HAL to V3

Bug: 328327545
Test: TH
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: I7582ba278abcb30cebe041f775efe45633a58bad
Signed-off-by: Jack Wu <wjack@google.com>
---
 health/android.hardware.health-service.zuma.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/health/android.hardware.health-service.zuma.xml b/health/android.hardware.health-service.zuma.xml
index 1fe9b8d2..2acaabac 100644
--- a/health/android.hardware.health-service.zuma.xml
+++ b/health/android.hardware.health-service.zuma.xml
@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.health</name>
-        <version>2</version>
+        <version>3</version>
         <fqname>IHealth/default</fqname>
     </hal>
 </manifest>