From 8ba12e3caab5832d24ceed13fd559711148e0a09 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Sat, 25 May 2024 00:37:46 +0000
Subject: [PATCH 1/3] explicit 'user root'

Bug: 340953047
Test: N/A
Change-Id: I3cfa4844916973c12ed9cff54361070cc091551f
---
 conf/init.gs201.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 4c6da6df..f36b8662 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -889,6 +889,7 @@ service init_display /vendor/bin/init.display.sh
 # bugreport is triggered by holding down volume down, volume up and power
 service bugreport /system/bin/dumpstate -d -p -z
     class main
+    user root
     disabled
     oneshot
     keycodes 114 115 116

From 10cd38d16ea564aad6e936b594d1ad8eab21ea5e Mon Sep 17 00:00:00 2001
From: Jim Tang <jimtang@google.com>
Date: Wed, 5 Jun 2024 11:58:34 +0800
Subject: [PATCH 2/3] 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: Idbd52236b95e8d69516226a71a848d591f181d94
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index c11e291f..58396790 100644
--- a/device.mk
+++ b/device.mk
@@ -927,6 +927,7 @@ endif
 # 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

From 0a14f4d4aabdf5ca09ce0c243d67b594dac0a2cd Mon Sep 17 00:00:00 2001
From: Utku Utkan <utkan@google.com>
Date: Wed, 5 Jun 2024 04:50:48 +0000
Subject: [PATCH 3/3] Remove ACCESS_FINE_LOCATION permission pregrant for PCS
 on G2

FLAG: EXEMPT Cleanup of obsolete permission pregrant

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

diff --git a/default-permissions.xml b/default-permissions.xml
index a6476338..ecdbaf01 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -50,7 +50,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"/>