From 0e5cd769fe31ee00a4e366502f1c35d048c3c17e Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Sat, 17 Feb 2024 12:33:52 +0800
Subject: [PATCH 1/3] gps: maintain one solution

Bug: 315915958
Test: build pass and GPS function works
Change-Id: I873fca68597188ccca7cd83e6665da5f047068aa
---
 conf/init.zumapro.board.rc | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index 2dc0b16..31c34ce 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -294,26 +294,6 @@ on post-fs-data
 # Video data
     mkdir /data/vendor/media 0700 mediacodec mediacodec
 
-on post-fs-data
-    # GPS
-    mkdir /data/vendor/gps 0771 system system
-    chown system system /data/vendor/gps
-    rm /data/vendor/gps/gps_started
-    rm /data/vendor/gps/glonass_started
-    rm /data/vendor/gps/beidou_started
-    rm /data/vendor/gps/smd_started
-    rm /data/vendor/gps/sv_cno.info
-
-    chown gps system /sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-    chmod 0664 /dev/ttyBCM
-    chown gps system /dev/ttyBCM
-    chmod 0664 /dev/bbd_control
-    chown gps system /dev/bbd_control
-    chmod 0664 /dev/bbd_patch
-    chown gps system /dev/bbd_patch
-    chmod 0664 /dev/bbd_sensor
-    chown gps system /dev/bbd_sensor
-
 on early-boot
     # Wait for insmod_sh to finish all common modules
     wait_for_prop vendor.common.modules.ready 1

From fc8c17c28b26891985d2ff678c1c3cf9be456280 Mon Sep 17 00:00:00 2001
From: jiangzining <jiangzining@google.com>
Date: Thu, 30 May 2024 14:39:15 +0800
Subject: [PATCH 2/3] [Scone] add BLUETOOTH_CONNECT to SCONE default permission

Bug: 343608940
MBA Approval: b/330640278
Test: Build and Flash
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b74903d33ee1b8dbc3e09950d994aae379b5a937)
Merged-In: I2aca6fbdc59e47d6e46af918d85661116b6424d8
Change-Id: I2aca6fbdc59e47d6e46af918d85661116b6424d8
---
 default-permissions.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index 8516cec..fc00a30 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -86,6 +86,8 @@
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
         <!-- Used to display notifications for Spectrum Speedboost and Satellite eSOS -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+        <!-- Used by Bluetooth Module to collect bluetooth info -->
+        <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
     <exception

From 66af5950c1c69b9d84bc21c9b1871c89b4975a76 Mon Sep 17 00:00:00 2001
From: Richard Chou <richardchou@google.com>
Date: Mon, 3 Jun 2024 17:49:35 +0800
Subject: [PATCH 3/3] zumapro: add build include for Recorder app in gs-common

Test: build pass
Bug: 338879856
Change-Id: I76ebf9f6d99857906dc3708274932898519e7b38
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index ad85c55..e566eaf 100644
--- a/device.mk
+++ b/device.mk
@@ -42,6 +42,7 @@ include device/google/gs-common/misc_writer/misc_writer.mk
 include device/google/gs-common/gyotaku_app/gyotaku.mk
 include device/google/gs-common/bootctrl/bootctrl_aidl.mk
 include device/google/gs-common/betterbug/betterbug.mk
+include device/google/gs-common/recorder/recorder.mk
 
 include device/google/zumapro/dumpstate/item.mk