From 95e5e15f24183657b373c74a1324045992644f85 Mon Sep 17 00:00:00 2001
From: Poomarin Phloyphisut <poomarin@google.com>
Date: Thu, 7 Sep 2023 15:39:11 +0000
Subject: [PATCH 1/2] pixelstats: change path for CCARatePath

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

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index dec6742a..4f7e18b7 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -94,7 +94,7 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     .WavesPath = "/sys/devices/platform/audiometrics/waves",
     .AdaptedInfoCountPath = "/sys/devices/platform/audiometrics/adapted_info_active_count",
     .AdaptedInfoDurationPath = "/sys/devices/platform/audiometrics/adapted_info_active_duration",
-    .CCARatePath = "/sys/devices/platform/audiometrics/cca_rate_read_once",
+    .CCARatePath = "/sys/devices/platform/audiometrics/cca_count_read_once",
     .PcmLatencyPath = "/sys/devices/platform/audiometrics/pcm_latency",
     .PcmCountPath = "/sys/devices/platform/audiometrics/pcm_count",
     .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count"

From f4be3b2c1c8abc15a548b9e00e160779dd805138 Mon Sep 17 00:00:00 2001
From: Bethany Barrientos <bbarrientos@google.com>
Date: Wed, 30 Aug 2023 11:12:05 -0500
Subject: [PATCH 2/2] Grant default permissions to PCS for camera connectivity

- android.permission.POST_NOTIFICATIONS
- android.permission.BLUETOOTH_CONNECT
- android.permission.BLUETOOTH_SCAN

Test: make and install. verify PCS had permissions.
Bug: 287069860
Change-Id: Iefd0d80d803b36610e14bdfec07b762d7c90bd58
---
 default-permissions.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index 1731dae1..a2189c4e 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -54,6 +54,9 @@
     <exception package="com.google.android.apps.camera.services">
         <!-- Camera -->
         <permission name="android.permission.CAMERA" fixed="false"/>
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+        <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
+        <permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.cbrsnetworkmonitor">