summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoonas Kylmälä <joonas.kylmala@iki.fi>2020-07-02 15:52:29 -0400
committerJoonas Kylmälä <joonas.kylmala@iki.fi>2020-07-02 15:52:29 -0400
commit91c4d92e594dc85df44eb7083770be881aa8b7d1 (patch)
tree38f13bdeae8b1839df4ad628988bb12b369c3659
parent918dc12f14e07530f8f93389589a21e70daf0f60 (diff)
downloaddevice_samsung_midas_common-91c4d92e594dc85df44eb7083770be881aa8b7d1.tar.gz
device_samsung_midas_common-91c4d92e594dc85df44eb7083770be881aa8b7d1.tar.bz2
device_samsung_midas_common-91c4d92e594dc85df44eb7083770be881aa8b7d1.zip
Add Bluetooth support
Even though we disable bluetooth in BluetoothManagerService.java this is needed so that we don't get crashes in the system. Alternative would be remove the bluetooth packages completely but that might break some APIs that apps use or add a lot more delta to upstream. Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
-rw-r--r--manifest.xml9
-rw-r--r--midas.mk8
2 files changed, 16 insertions, 1 deletions
diff --git a/manifest.xml b/manifest.xml
index f596300..d83f9df 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -141,4 +141,13 @@
<instance>default</instance>
</interface>
</hal>
+ <hal>
+ <name>android.hardware.bluetooth</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IBluetoothHci</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
</manifest>
diff --git a/midas.mk b/midas.mk
index 32e7235..1165355 100644
--- a/midas.mk
+++ b/midas.mk
@@ -36,6 +36,11 @@ PRODUCT_PACKAGES += \
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xhdpi
+# Bluetooth HW support
+PRODUCT_PACKAGES += \
+ android.hardware.bluetooth@1.0-service.btlinux \
+ android.hardware.bluetooth.audio@2.0-impl
+
# OEM Lock HAL
PRODUCT_PACKAGES += \
android.hardware.oemlock@1.0-service
@@ -158,4 +163,5 @@ PRODUCT_COPY_FILES += device/samsung/midas-common/prevent_suspend.rc:system/etc/
# Enable Hardware compoments on the framework level
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
+ frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
+ frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml