From 695e32ec40a6da904b40cf6b8592b76ff4ba6e5f Mon Sep 17 00:00:00 2001
From: Poomarin Phloyphisut <poomarin@google.com>
Date: Tue, 22 Aug 2023 15:09:31 +0000
Subject: [PATCH 1/2] pixelstats: add total call count sysfs for
 VendorAudioHardwareStatsReported

Bug: 289857250
Test: Local Test
Change-Id: Ib5758629e46ac10282f423eb926fc25bdf4513b5
---
 pixelstats/service.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index c5b20b42..dec6742a 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -96,7 +96,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     .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"
+    .PcmCountPath = "/sys/devices/platform/audiometrics/pcm_count",
+    .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count"
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {

From 49e4648f35fce08eb7b9ac196517a795de73e413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Fri, 25 Aug 2023 02:51:54 +0000
Subject: [PATCH 2/2] Set USF SoC from board makefile.

Bug: 296943650
Test: presubmit
Change-Id: I0193a1683bb8319985edad855ab63b9333d56018
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index acf7b22f..84e7aab3 100644
--- a/device.mk
+++ b/device.mk
@@ -944,6 +944,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
 #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
 include device/google/gs-common/sensors/sensors.mk
+$(call soong_config_set,usf,target_soc,zuma)
 
 PRODUCT_COPY_FILES += \
 	device/google/zuma/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \