From e2155d5cc4a5e3df8073deae19a35282cba6f83f Mon Sep 17 00:00:00 2001
From: Utku Utkan <utkan@google.com>
Date: Wed, 5 Jun 2024 04:51:09 +0000
Subject: [PATCH 1/2] Remove ACCESS_FINE_LOCATION permission pregrant for PCS
 on Zuma

FLAG: EXEMPT Cleanup of obsolete permission pregrant

Bug: 345021501
Test: m && flashall
Change-Id: Ia59acea79baadb45083adc76f52d62a0fb184762
---
 default-permissions.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/default-permissions.xml b/default-permissions.xml
index 1764bc1a..00959c8f 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -59,7 +59,6 @@
         <!-- Camera -->
         <permission name="android.permission.CAMERA" fixed="false"/>
         <!-- Camera Connectivity -->
-        <permission name="android.permission.ACCESS_FINE_LOCATION" 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"/>

From 1f43d128df1b4247c8979e06f4cd4e61edc64f82 Mon Sep 17 00:00:00 2001
From: Jim Tang <jimtang@google.com>
Date: Wed, 5 Jun 2024 12:10:50 +0800
Subject: [PATCH 2/2] Make SUPPORT_MULTI_SIM recognizable in bp

This commit establishes a soong config variable `sim_count` for
easier converting Android.mk to Android.bp when dealing with multiple
SIMs.

Bug: 343823190
Test: presubmit
Change-Id: I93d355e30771868f1c4664eebbce579e1e37cdcb
---
 device.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/device.mk b/device.mk
index d2fe0a0b..ebc305e9 100644
--- a/device.mk
+++ b/device.mk
@@ -931,7 +931,9 @@ PRODUCT_PACKAGES += \
 # Exynos RIL and telephony
 # Multi SIM(DSDS)
 SIM_COUNT := 2
+$(call soong_config_set,sim,sim_count,$(SIM_COUNT))
 SUPPORT_MULTI_SIM := true
+
 # Support NR
 SUPPORT_NR := true
 # Support 5G on both stacks