From d71ae81d84e85324123911f795caf5601908d109 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Fri, 27 Oct 2023 13:11:54 +0100
Subject: [PATCH] sabrina: Properly overlay Bluetooth apex

Change-Id: I87c4f1136fd68490bd55bda4033f36988cbd57f1
---
 device.mk                                       |  7 ++-----
 rro_overlays/BluetoothOverlay/Android.bp        | 11 +++++++++++
 .../BluetoothOverlay/AndroidManifest.xml        | 17 +++++++++++++++++
 .../BluetoothOverlay}/res/values/config.xml     |  0
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 rro_overlays/BluetoothOverlay/Android.bp
 create mode 100644 rro_overlays/BluetoothOverlay/AndroidManifest.xml
 rename {overlay/packages/apps/Bluetooth => rro_overlays/BluetoothOverlay}/res/values/config.xml (100%)

diff --git a/device.mk b/device.mk
index 8ad2b06..088687c 100644
--- a/device.mk
+++ b/device.mk
@@ -1,11 +1,12 @@
 #
-# Copyright (C) 2021-2022 The LineageOS Project
+# Copyright (C) 2021-2023 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
 ## Bluetooth
 PRODUCT_PACKAGES += \
+    SabrinaBluetoothOverlay \
     libbt-vendor
 
 ## Init-Files
@@ -19,10 +20,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     dhd
 
-## Overlays
-DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay
-
 ## Wi-Fi
 TARGET_DHD_VERSION := bcmdhd.100.10.545.x
 
diff --git a/rro_overlays/BluetoothOverlay/Android.bp b/rro_overlays/BluetoothOverlay/Android.bp
new file mode 100644
index 0000000..63102c6
--- /dev/null
+++ b/rro_overlays/BluetoothOverlay/Android.bp
@@ -0,0 +1,11 @@
+//
+// Copyright (C) 2023 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+runtime_resource_overlay {
+    name: "SabrinaBluetoothOverlay",
+    resource_dirs: ["res"],
+    sdk_version: "current",
+    proprietary: true
+}
diff --git a/rro_overlays/BluetoothOverlay/AndroidManifest.xml b/rro_overlays/BluetoothOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..334895a
--- /dev/null
+++ b/rro_overlays/BluetoothOverlay/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2023 The LineageOS Project
+
+     SPDX-License-Identifier: Apache-2.0
+-->
+<!-- Device specific bluetooth overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.bluetooth.sabrina"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.bluetooth"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/overlay/packages/apps/Bluetooth/res/values/config.xml b/rro_overlays/BluetoothOverlay/res/values/config.xml
similarity index 100%
rename from overlay/packages/apps/Bluetooth/res/values/config.xml
rename to rro_overlays/BluetoothOverlay/res/values/config.xml
-- 
2.20.1