From ed733ea5073f2e19360f64af95690805ff2d5ef3 Mon Sep 17 00:00:00 2001
From: Akash Malik <malikakash@google.com>
Date: Fri, 12 Apr 2024 22:30:13 +0000
Subject: [PATCH 1/3] Pregrant POST_NOTIFICATIONS to CreativeAssistant

This will allow showing persistent, cancellable notifications when downloading models in a foreground service.

Demo:
https://drive.google.com/file/d/1IoSQsVxUrUN8ohqY3nGbuXvCD-C_78ao/view?usp=drive_link&resourcekey=0-QQ4z3f4XCoIf4H9CdEDa4g

Note: I'm submitting to main before, and I will cp into 24D1.
Note: Yes, zumapro default permissions also apply to caimito.

Bug: 308029155
Test: m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:18db77ac1cbc62916a82f83ea6449d8900dd1852)
Merged-In: I9e9017fc056a5c9f13f481f43317f551413390ca
Change-Id: I9e9017fc056a5c9f13f481f43317f551413390ca
---
 default-permissions.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index 6230f4c..1988aea 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -65,6 +65,10 @@
         <permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>
     </exception>
 
+    <exception package="com.google.android.apps.pixel.creativeassistant">
+        <permission name="android.permission.POST_NOTIFICATIONS" 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"/>

From a0801299cef33397d8251b169847fc9311d408be Mon Sep 17 00:00:00 2001
From: silens <silens@google.com>
Date: Fri, 19 Apr 2024 03:48:39 +0000
Subject: [PATCH 2/3] Remove "bluetooth.profile.bap.broadcast.assist.enabled"
 in "zumapro/device.mk"

This prop should not be set here.
If enable broadcast assistant, set it directly in device.mk of the product.

Bug: 322258710
Test: build
Change-Id: Iabb77e0e65fed6cb725c96bfdc451da0c2003fb3
---
 device.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/device.mk b/device.mk
index ea07495..fab166a 100644
--- a/device.mk
+++ b/device.mk
@@ -180,7 +180,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.asha.central.enabled=true \
 	bluetooth.profile.a2dp.source.enabled=true \
 	bluetooth.profile.avrcp.target.enabled=true \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
 	bluetooth.profile.bap.unicast.server.enabled=true \
 	bluetooth.profile.bas.client.enabled=true \
 	bluetooth.profile.csip.set_coordinator.enabled=true \

From 95ec9408044d3d18516d3d1f502c7ad64d4bed09 Mon Sep 17 00:00:00 2001
From: Jenny Ho <hsiufangho@google.com>
Date: Tue, 23 Apr 2024 14:23:36 +0800
Subject: [PATCH 3/3] dump_power: add max77779 fwupdate logbuffer into
 bugreport

Bug: 334198978
Change-Id: I62fcde4a49024ccacc96a3139bb3284c41ceea58
Signed-off-by: Jenny Ho <hsiufangho@google.com>
---
 dumpstate/dump_power.cpp | 1 +
 dumpstate/dump_power.rc  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp
index e312cb0..58a4fcc 100644
--- a/dumpstate/dump_power.cpp
+++ b/dumpstate/dump_power.cpp
@@ -326,6 +326,7 @@ void dumpBatteryHealth() {
             {"TTF stats", "/sys/class/power_supply/battery/ttf_stats"},
             {"aacr_state", "/sys/class/power_supply/battery/aacr_state"},
             {"pairing_state", "/sys/class/power_supply/battery/pairing_state"},
+            {"fwupdate", "/dev/logbuffer_max77779_fwupdate"}
     };
 
     const char* maxqName = "maxq logbuffer";
diff --git a/dumpstate/dump_power.rc b/dumpstate/dump_power.rc
index 60234e2..67d7ea1 100644
--- a/dumpstate/dump_power.rc
+++ b/dumpstate/dump_power.rc
@@ -108,6 +108,7 @@ on early-boot
     chown system system /dev/logbuffer_ln8411
     chown system system /dev/logbuffer_cpm
     chown system system /dev/logbuffer_wc68
+    chown system system /dev/logbuffer_max77779_fwupdate
 
 on property:sys.boot_completed=1
     # gvotables for dumpstate