From a09ad23552da9296c1c0afedcdd5d28f9ad46bcf Mon Sep 17 00:00:00 2001
From: Scott Wiest <scottwiest@google.com>
Date: Tue, 4 Jun 2024 18:05:40 +0000
Subject: [PATCH 1/2] Removing unneeded potentially harmful permissions in
 Creative Assistant

Bug: 339334303

FLAG: EXEMPT Bugfix to remove the permissions that were flagged as harmful and are no longer being used.

Change-Id: Ibc3915b2154cecf40a8484b2ffb8eef8a2ad52d0
---
 default-permissions.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/default-permissions.xml b/default-permissions.xml
index fc00a30..a0aa143 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -67,9 +67,6 @@
 
     <exception package="com.google.android.apps.pixel.creativeassistant">
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-        <permission name="android.permission.READ_MEDIA_IMAGES" fixed="false"/>
-        <permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="false"/>
-        <permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.cbrsnetworkmonitor">

From 6f9888658d3ec38cb1475e98babe919cd8537c30 Mon Sep 17 00:00:00 2001
From: Kah Xuan Lim <kahxuan@google.com>
Date: Tue, 4 Jun 2024 06:05:01 +0000
Subject: [PATCH 2/2] Disable modemml-tflite-service for aosp build

For aosp build, the vendor module `modemml-tflite-service` is not included so it shouldn't be added as a system_server jar.

Bug: 343341492
Bug: 343367700
Test: Build with target non-aosp targets in presubmit and aosp targets following the reproduce steps in b/343341492
Change-Id: Ib32ec2c31570eb3566c80de4ed510f17ec9e9a39
---
 device.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/device.mk b/device.mk
index e47d425..28d1693 100644
--- a/device.mk
+++ b/device.mk
@@ -970,11 +970,13 @@ PRODUCT_PACKAGES += modem_svc_sit
 # modem_ml_svc_sit daemon
 PRODUCT_PACKAGES += modem_ml_svc_sit
 
+ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 # Modem ML TFLite service.
 PRODUCT_PACKAGES += modemml-tflite-service \
 	libtensorflowlite_jni
 
 PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service
+endif
 
 # modem ML models configs
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))