From 06827afaf280bacd72a767381012a4cb8864f3fb Mon Sep 17 00:00:00 2001
From: Ted Wang <tedwang@google.com>
Date: Wed, 29 Mar 2023 12:50:03 +0000
Subject: [PATCH 1/2] Remove bluetooth related hidl hal from manifest

Bug: 274906319
Test: build pass
Change-Id: I64f3912061400842b78b65617f01269751a9d04e
---
 device_framework_matrix_product.xml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 53c4d507..811c2885 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -175,30 +175,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.bt_channel_avoidance</name>
-        <version>1.0</version>
-        <interface>
-            <name>IBTChannelAvoidance</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.sar</name>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothSar</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
         <version>2</version>

From ea194708f247e5aa90917fd38e36693534fa3024 Mon Sep 17 00:00:00 2001
From: Manali Bhutiyani <manalib@google.com>
Date: Wed, 12 Apr 2023 06:55:54 +0000
Subject: [PATCH 2/2] [display-stats] add display stats paths for zuma devices.

Bug: 259554507
Test: Build and boot on device
adb shell cmd stats print-stats | grep -i <atom-id>

Change-Id: Iaed69cbce6ea002f07fe3374aadf97a07937ef5b
---
 pixelstats/service.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 783b80d0..84632f10 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -75,7 +75,13 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
             "/sys/kernel/metrics/thermal/tr_by_group/spmic/stats",
     },
     .ModemPcieLinkStatsPath = "/sys/devices/platform/12100000.pcie/link_stats",
-    .WifiPcieLinkStatsPath = "/sys/devices/platform/13120000.pcie/link_stats"
+    .WifiPcieLinkStatsPath = "/sys/devices/platform/13120000.pcie/link_stats",
+    .DisplayStatsPaths = {
+        "/sys/devices/platform/exynos-drm/primary-panel/error_count_te",
+        "/sys/devices/platform/exynos-drm/primary-panel/error_count_unknown",
+        "/sys/devices/platform/exynos-drm/secondary-panel/error_count_te",
+        "/sys/devices/platform/exynos-drm/secondary-panel/error_count_unknown",
+    }
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {