Kingfisher: bluetooth fixes

Add proper dbus configs
Enable bluetooth on startup

6 files changed, 38 insertions, 1 deletions

diff --git a/meta-rcar-gen3-adas/conf/layer.conf b/meta-rcar-gen3-adas/conf/layer.conf
index 1a7e025..6bbd590 100644
--- a/meta-rcar-gen3-adas/conf/layer.conf
+++ b/meta-rcar-gen3-adas/conf/layer.conf
@@ -45,6 +45,7 @@ IMAGE_INSTALL_append_rcar-gen3 = " \
     pulseaudio-module-cli \
     pulseaudio-module-remap-sink \
     pulseaudio-module-remap-source \
+    pulseaudio-module-loopback \
     gstreamer1.0-plugins-good-pulse \
     gdbserver \
     most-tools \
@@ -73,6 +74,7 @@ IMAGE_INSTALL_append_rcar-gen3 += " \
 DISTRO_FEATURES_remove="x11"
 DISTRO_FEATURES_append = " surroundview "
 DISTRO_FEATURES_append = " opencv-sdk "
+DISTRO_FEATURES_append = " bluetooth"
 
 IMAGE_INSTALL_remove = "gtk+3-demo clutter-1.0-examples"
 
diff --git a/meta-rcar-gen3-adas/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-rcar-gen3-adas/recipes-connectivity/bluez5/bluez5_%.bbappend
new file mode 100644
index 0000000..99b0ede
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-connectivity/bluez5/bluez5_%.bbappend
@@ -0,0 +1,16 @@
+FILESEXTRAPATHS_append := "${THISDIR}/files:"
+
+SRC_URI_append_rcar-gen3 = " \
+    file://main.conf \
+"
+
+PACKAGECONFIG_append = " experimental"
+
+NOINST_TOOLS_EXPERIMENTAL_remove = " tools/bdaddr"
+
+
+do_install_append_rcar-gen3() {
+    install -d ${D}/etc/bluetooth
+
+    install -m 644 ${WORKDIR}/main.conf ${D}/${sysconfdir}/bluetooth/
+}
diff --git a/meta-rcar-gen3-adas/recipes-connectivity/bluez5/files/main.conf b/meta-rcar-gen3-adas/recipes-connectivity/bluez5/files/main.conf
new file mode 100644
index 0000000..d3e19f7
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-connectivity/bluez5/files/main.conf
@@ -0,0 +1,2 @@
+[Policy]
+AutoEnable=true
diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf
new file mode 100644
index 0000000..e526d77
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf
@@ -0,0 +1,15 @@
+<busconfig>
+
+  <policy user="pulse">
+    <allow own="org.pulseaudio.Server"/>
+    <allow send_destination="org.bluez"/>
+    <allow send_destination="org.ofono"/>
+    <allow send_interface="org.ofono.SimToolkitAgent"/>
+    <allow send_interface="org.ofono.PushNotificationAgent"/>
+    <allow send_interface="org.ofono.SmartMessagingAgent"/>
+    <allow send_interface="org.ofono.PositioningRequestAgent"/>
+    <allow send_interface="org.ofono.HandsfreeAudioAgent"/>
+    <allow send_interface="org.ofono.HandsfreeAudioManager"/>
+  </policy>
+
+</busconfig>
diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa
index 89af11a..fe585ec 100644
--- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa
+++ b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa
@@ -67,7 +67,7 @@ load-module module-bluetooth-policy
 .endif
 
 .ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
+load-module module-bluetooth-discover headset=auto
 .endif
 
 set-default-sink ak4613_output
diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend
index aba7e61..06710e9 100644
--- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend
+++ b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend
@@ -9,6 +9,7 @@ SRC_URI_append_rcar-gen3 = " \
     file://system.pa \
     file://daemon.conf \
     file://pulseaudio-bluetooth.conf \
+    file://pulseaudio-ofono.conf \
 "
 
 inherit update-rc.d
@@ -31,6 +32,7 @@ do_install_append_rcar-gen3() {
 
     install -d ${D}/${sysconfdir}/dbus-1/system.d
     install -m 644 ${WORKDIR}/pulseaudio-bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
+    install -m 644 ${WORKDIR}/pulseaudio-ofono.conf ${D}/${sysconfdir}/dbus-1/system.d/
 
     update-rc.d -r ${D} pulseaudio defaults 30
 }