From 2aec743b4bf26764134c023dcc397cd421675465 Mon Sep 17 00:00:00 2001
From: jonerlin <jonerlin@google.com>
Date: Mon, 25 Nov 2024 17:26:10 +0000
Subject: [PATCH 1/4] init.zumapro.board.rc: bluetooth own uart debug node

Bug: 376774204
Test: Manual
Flag: EXEMPT project configuration patch
Change-Id: Iedd5c0e9fd7c917c152c156adffb62f9043f11c5
---
 conf/init.zumapro.board.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index c369eb7..471198d 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -639,6 +639,7 @@ on post-fs-data
     chown bluetooth system /proc/bluetooth/sleep/btwake
     chown bluetooth system /proc/bluetooth/sleep/lpm
     chown bluetooth system /proc/bluetooth/sleep/btwrite
+    chown bluetooth system /sys/devices/platform/155d0000.serial/uart_dbg
     mkdir /data/vendor/bluetooth 0770 bluetooth system
 
 # ODPM

From 1887e6e5215d01b11294dcc25c10aaafbaa823be Mon Sep 17 00:00:00 2001
From: Nelson Li <nelsonli@google.com>
Date: Wed, 27 Nov 2024 06:31:35 +0000
Subject: [PATCH 2/4] Change TARGET_RECOVERY_UI_LIB to use fully qualified
 names in zumapro

Since the TARGET_RECOVERY_UI_LIB for each device is not exactly the
same, and most of the modules in it contain `soong_namespace{}` to
avoid conflicts between different devices, after converting
`librecovery_ui_ext` from Android.mk to Android.bp, it needs to be
changed to a `fully qualified name` in order to correctly use the
corresponding module.

Flag: EXEMPT refactor

Bug: 339143524
Test: m -j librecovery_ui_ext
Change-Id: I4b585c0b73366ba5e1f8c6461ed3ed62547af7b7
---
 BoardConfig-common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 998bd5c..1c82e9b 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -79,7 +79,7 @@ TARGET_RECOVERY_FSTAB_GENRULE := gen_fstab.zumapro-sw-encrypt
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
 TARGET_RECOVERY_UI_LIB := \
-	librecovery_ui_pixel \
+	//hardware/google/pixel/recovery:librecovery_ui_pixel \
 	libfstab
 
 AB_OTA_UPDATER := true

From 5c61b703003d73deb3435334faddbdb86754c953 Mon Sep 17 00:00:00 2001
From: Adrian Mejia <adrianmg@google.com>
Date: Wed, 4 Dec 2024 19:35:05 +0000
Subject: [PATCH 3/4] Add
 `config_satellite_allow_tn_scanning_during_satellite_session` flag.

Bug: 382143173
Change-Id: Iedd8a22bd43024d07058448b8b8cda793264c750
Test: config change
Flag: EXEMPT config change
---
 overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 93af15c..a0ab8c6 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -545,4 +545,7 @@
     <!-- Whether to allow check message datagrams to be sent even when the satellite modem is in
          not connected state. -->
     <bool name="config_satellite_allow_check_message_in_not_connected">true</bool>
+
+    <!-- Whether to allow TN scanning during satellite session. -->
+    <bool name="config_satellite_allow_tn_scanning_during_satellite_session">false</bool>
 </resources>

From a547826e2e86aee7901eb2c4c680e97873b0e390 Mon Sep 17 00:00:00 2001
From: Tim Lin <timtmlin@google.com>
Date: Thu, 5 Dec 2024 07:14:39 +0000
Subject: [PATCH 4/4] Add
 `config_satellite_carrier_roaming_esos_provisioned_class` for  the intent to
 trigger satellite provisioning

Bug: 381285467
Test: make
Flag: EXEMPT resource only update

Change-Id: Ib253b2eca0a70f45eca1d9749cf9462fd4cc1d26
---
 overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 93af15c..c559bae 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -492,6 +492,9 @@
     <!-- Telephony satellite gateway service package name to bind to by default. -->
     <string name="config_satellite_gateway_service_package">com.google.android.apps.stargate</string>
 
+    <!-- The class name to receive the intent for provisioning. -->
+    <string name="config_satellite_carrier_roaming_esos_provisioned_class">com.google.android.apps.stargate.registration.RegistrationReceiver_Receiver</string>
+
     <!-- List of country codes where oem-enabled satellite services are either allowed or disallowed
          by the device. Each country code is a lowercase 2 character ISO-3166-1 alpha-2. -->
     <string-array name="config_oem_enabled_satellite_country_codes">