From f04b28dc410c819627a50522ba82563f87ce2097 Mon Sep 17 00:00:00 2001
From: Jerry Huang <huangjerry@google.com>
Date: Wed, 12 Jun 2024 16:50:38 +0800
Subject: [PATCH 1/3] zumapro: video: change to use c2 "default" AIDL service

Bug: 322920559
Change-Id: Ia2e6cac052bc0ee417e179f61804eada9ae87bf5
---
 device.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 3389983..7037e12 100644
--- a/device.mk
+++ b/device.mk
@@ -399,6 +399,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 DEVICE_MANIFEST_FILE := \
 	device/google/zumapro/manifest.xml
 
+BOARD_USE_CODEC2_AIDL := V1
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 DEVICE_MANIFEST_FILE += \
 	device/google/zumapro/manifest_media_aosp.xml
@@ -874,12 +875,19 @@ PRODUCT_COPY_FILES += \
 	device/google/zumapro/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
 
 PRODUCT_PROPERTY_OVERRIDES += \
-       debug.stagefright.c2-poolmask=458752 \
        debug.c2.use_dmabufheaps=1 \
        media.c2.dmabuf.padding=512 \
        debug.stagefright.ccodec_delayed_params=1 \
        ro.vendor.gpu.dataspace=1
 
+ifneq ($(BOARD_USE_CODEC2_AIDL), )
+PRODUCT_PROPERTY_OVERRIDES += \
+        debug.stagefright.c2-poolmask=1507328
+else
+PRODUCT_PROPERTY_OVERRIDES += \
+        debug.stagefright.c2-poolmask=458752
+endif
+
 # Create input surface on the framework side
 PRODUCT_PROPERTY_OVERRIDES += \
 	debug.stagefright.c2inputsurface=-1 \

From 95dc4cb9ed5f38b6aeb3c23ed97d8fc186464c29 Mon Sep 17 00:00:00 2001
From: Vishvam Mazumdar <vmazumdar@google.com>
Date: Mon, 17 Jun 2024 20:06:47 +0000
Subject: [PATCH 2/3] Defaultly enable cpu idle histogram stats collection for
 dumpstate.

This change is to allow the CPU Idle Histogram Stats to be dumped in
bugreports so that there is more insight into the idle behavior of
devices in the field.

Test: Build/Flash
Test: Collect histogram log
Bug: 344908619
Flag: EXEMPT bugfix
Change-Id: I3a670060048b620c9d20f1a4dedbd4d992e925ca
Signed-off-by: Vishvam Mazumdar <vmazumdar@google.com>
---
 conf/init.zumapro.board.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index dcee57a..eab4b41 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -183,6 +183,9 @@ on init
     chown root system /sys/devices/platform/16490000.gsa-ns/log_main
     chown root system /sys/devices/platform/16490000.gsa-ns/log_intermediate
 
+    # Enable CPU Idle histograms
+    write /sys/kernel/metrics/cpuidle_histogram/enable 1
+
 on post-fs
     # Ensure device is ready and start storageproxyd
     wait /dev/sg1

From 3d7e868fb4b823c39ca18df5f6a8fb6f560399ef Mon Sep 17 00:00:00 2001
From: Robert Luo <robertluo@google.com>
Date: Mon, 29 Apr 2024 14:24:10 +0800
Subject: [PATCH 3/3] [Pixel RR] Apply reviewed default permissions

Pregrantting below permissions:
READ_CONTACTS
WRITE_CONTACTS
READ_CALL_LOG

Flag: EXEMPT add pregranted permission in b/337725984, b/337802920
Bug: 337725984, 337802920
Test: presubmit
Change-Id: I76042e951ddba89914c5b347497d44ef0a7faf2e
---
 default-permissions.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index 2d04542..2f6f13f 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -68,6 +68,13 @@
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
 
+    <exception package="com.google.android.apps.pixel.relationships">
+        <!-- Contacts -->
+        <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
+        <permission name="android.permission.READ_CONTACTS" fixed="false"/>
+        <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
+    </exception>
+
     <exception package="com.google.android.apps.cbrsnetworkmonitor">
         <!-- Location access to create CBRS geofences-->
         <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="true"/>