From f34142e084c4881683fab2f5a4c127a7bd227947 Mon Sep 17 00:00:00 2001
From: Jim Tang <jimtang@google.com>
Date: Wed, 5 Jun 2024 11:17:57 +0800
Subject: [PATCH 1/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: I8226003df3d9f669df6e2af12310ad73e5786a74
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 3022a347..c50291b4 100644
--- a/device.mk
+++ b/device.mk
@@ -904,6 +904,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 1b51d6b7987d1e98e680ad603d442c0f41cfb74b Mon Sep 17 00:00:00 2001
From: Dennis Shen <dzshen@google.com>
Date: Wed, 5 Jun 2024 12:59:23 +0000
Subject: [PATCH 2/3] switch over to use new storage read api instead of
 server_configurable_flags, this new read api lib will be needed for new
 codegened aconfig flag lib.

Bug: 321077378
Test m and avd

Change-Id: Ieab46eb2561f910be2bf016fe4c63062a4e31a66
---
 usb/usb/Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index 5afdcc66..fa7a07f7 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -52,6 +52,7 @@ cc_binary {
         "libbinder_ndk",
         "libprotobuf-cpp-lite",
         "server_configurable_flags",
+        "libaconfig_storage_read_api_cc",
     ],
     static_libs: [
         "libpixelusb",

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

FLAG: EXEMPT Cleanup of obsolete permission pregrant

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

diff --git a/default-permissions.xml b/default-permissions.xml
index 03fdec2d..3ba60117 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -55,7 +55,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"/>