From f2d819644167803add0479a9add27b0b894ef43b Mon Sep 17 00:00:00 2001
From: Devika Krishnadas <kdevika@google.com>
Date: Mon, 26 Feb 2024 17:58:11 +0000
Subject: [PATCH 1/5] Move Gralloc packages to gs-common

Bug: 275906497
Test: Boot succeeds

Change-Id: I879a5ef8365abe018c501cdb0b06c9753e0e5902
Signed-off-by: Devika Krishnadas <kdevika@google.com>
---
 device.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/device.mk b/device.mk
index 9edf65e8..39f6bbdb 100644
--- a/device.mk
+++ b/device.mk
@@ -508,10 +508,6 @@ PRODUCT_PACKAGES += \
 	com.android.future.usb.accessory
 
 # for now include gralloc here. should come from hardware/google_devices/exynos5
-PRODUCT_PACKAGES += \
-	android.hardware.graphics.mapper@4.0-impl \
-	android.hardware.graphics.allocator-V1-service
-
 PRODUCT_PACKAGES += \
 	android.hardware.memtrack-service.pixel \
 	libion_exynos \

From 9ad27501e4fd196b6ec9c2a3eec27c5e6e585717 Mon Sep 17 00:00:00 2001
From: Mark Chang <changmark@google.com>
Date: Fri, 1 Mar 2024 12:02:34 +0000
Subject: [PATCH 2/5] Add sepolicy include to gs101.

Bug: 325422902
Test: Manual, system booted without sepolicy denied error.

Change-Id: I2149188a925cc94aea077e9b6fb78cc850660dd7
Signed-off-by: Mark Chang <changmark@google.com>
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 39f6bbdb..69ef69f0 100644
--- a/device.mk
+++ b/device.mk
@@ -1113,3 +1113,4 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
 
 # Touch service
 include device/google/gs-common/touch/twoshay/aidl_gs101.mk
+include device/google/gs-common/touch/twoshay/twoshay.mk

From def43cc017a9abb719b2dcf153fa4b2f05d7eaa0 Mon Sep 17 00:00:00 2001
From: Wonsik Kim <wonsik@google.com>
Date: Fri, 26 Jan 2024 15:57:28 -0800
Subject: [PATCH 3/5] Add AIDL media.c2 fragments

Bug: 321808716
Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default
Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default1
Change-Id: I3a0a38f71421a8673038f63764250f7a1a88c730
---
 manifest_media.xml      | 10 ++++++++++
 manifest_media_aosp.xml |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/manifest_media.xml b/manifest_media.xml
index 38e56ba2..329dd2d4 100644
--- a/manifest_media.xml
+++ b/manifest_media.xml
@@ -17,4 +17,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl">
+        <name>android.hardware.media.c2</name>
+        <version>1</version>
+        <fqname>IComponentStore/default1</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.media.c2</name>
+        <version>1</version>
+        <fqname>IComponentStore/default</fqname>
+    </hal>
 </manifest>
diff --git a/manifest_media_aosp.xml b/manifest_media_aosp.xml
index 9a1a3dba..d92e4a28 100644
--- a/manifest_media_aosp.xml
+++ b/manifest_media_aosp.xml
@@ -8,4 +8,9 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl">
+        <name>android.hardware.media.c2</name>
+        <version>1</version>
+        <fqname>IComponentStore/default</fqname>
+    </hal>
 </manifest>

From 3c31047ecf2ce2c9c8e0bbf6c59f79d18135e6af Mon Sep 17 00:00:00 2001
From: Barry <wangbarry@google.com>
Date: Tue, 5 Mar 2024 09:36:50 +0000
Subject: [PATCH 4/5] BT: set system property for Bluetooth Auto On

Set bluetooth.server.automatic_turn_on true for Bluetooth Auto On
feature.
The feature will be enabled with both system property and flag set.

Bug: 328168526
Test: check system property value
Change-Id: If7e9c3bab450dead2cfd46dddc55d293ccab3d92
---
 device.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device.mk b/device.mk
index 69ef69f0..94d92c54 100644
--- a/device.mk
+++ b/device.mk
@@ -815,6 +815,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	persist.bluetooth.bqr.min_interval_ms=500
 endif
 
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
+
 #VNDK
 PRODUCT_PACKAGES += \
 	vndk-libs

From a43fedce4ef60251336a86c470250b2dfb8c9f3e Mon Sep 17 00:00:00 2001
From: Daniel Chapin <chapin@google.com>
Date: Tue, 5 Mar 2024 00:55:40 +0000
Subject: [PATCH 5/5] Revert "Add betterbug mk to gs101"

Revert submission 26348985-bb-sepolicy-poc

Reason for revert: Droidfood blocking bug: b/327991669

Bug: b/327991669

Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc

Change-Id: I88a445da895c373c0a53c8a2f08726582c27be77
---
 device.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/device.mk b/device.mk
index 94d92c54..d74516c3 100644
--- a/device.mk
+++ b/device.mk
@@ -36,7 +36,6 @@ include device/google/gs-common/sota_app/factoryota.mk
 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
 ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif