Ubuntu Touch session manager

Merge lp:~morphis/ubuntu-touch-session/add-bluez5-support into lp:ubuntu-touch-session/stable-overlay

  1. add-bluez5-support
  2. Merge into stable-overlay
Proposed by Simon Fels
Status: Merged
Approved by: Simon Fels
Approved revision: 287
Merged at revision: 278
Proposed branch: lp:~morphis/ubuntu-touch-session/add-bluez5-support
Merge into: lp:ubuntu-touch-session/stable-overlay
Diff against target: 55 lines (+14/-3)
5 files modified
touch.pa (+2/-2)
ubuntu-touch-session.d/flo.conf (+1/-0)
ubuntu-touch-session.d/mako.conf (+1/-0)
upstart-session/bluez-mpris-proxy.conf (+9/-0)
upstart-session/obexd.conf (+1/-1)
To merge this branch: bzr merge lp:~morphis/ubuntu-touch-session/add-bluez5-support
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
Review via email: mp+269633@code.launchpad.net

Commit message

Add support for BlueZ 5

Description of the change

Add support for BlueZ 5

To post a comment you must log in.
lp:~morphis/ubuntu-touch-session/add-bluez5-support updated
279. By Simon Fels

Adjust obexd's location

280. By Simon Fels

Switch to native bluetooth backend for PulseAudio until we have ofono ready

281. By Simon Fels

Renable ofono backend for PulseAudio as updated ofono as now landed in our images

282. By Simon Fels

Drop support for BlueZ 4.x

283. By Simon Fels

Improve BlueZ 5.x audio routing and HFP/A2DP profile support

284. By Simon Fels

Disable several obexd plugins we don't support yet and limit access to users HOME folder

285. By Simon Fels

Use both backends (ofono and native) for bluetooth support in PulseAudio

286. By Simon Fels

Add FORM_FACTOR value for flo and mako

287. By Simon Fels

Start MPRIS proxy service on session startup

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'touch.pa'
--- touch.pa 2015-08-25 12:33:04 +0000
+++ touch.pa 2015-10-19 20:21:50 +0000
@@ -68,8 +68,8 @@
68load-module module-bluetooth-policy68load-module module-bluetooth-policy
69.endif69.endif
7070
71.ifexists module-bluez4-discover.so71.ifexists module-bluez5-discover.so
72load-module module-bluez4-discover profile=a2dp sco_sink=sink.fake.sco sco_source=source.fake.sco72load-module module-bluez5-discover headset=both profile=a2dp_sink sco_sink=sink.fake.sco sco_source=source.fake.sco
73.endif73.endif
7474
75### Load several protocols75### Load several protocols
7676
=== modified file 'ubuntu-touch-session.d/flo.conf'
--- ubuntu-touch-session.d/flo.conf 2014-03-02 12:54:19 +0000
+++ ubuntu-touch-session.d/flo.conf 2015-10-19 20:21:50 +0000
@@ -1,3 +1,4 @@
1GRID_UNIT_PX=181GRID_UNIT_PX=18
2QTWEBKIT_DPR=2.02QTWEBKIT_DPR=2.0
3NATIVE_ORIENTATION=landscape3NATIVE_ORIENTATION=landscape
4FORM_FACTOR=tablet
45
=== modified file 'ubuntu-touch-session.d/mako.conf'
--- ubuntu-touch-session.d/mako.conf 2013-06-04 16:36:00 +0000
+++ ubuntu-touch-session.d/mako.conf 2015-10-19 20:21:50 +0000
@@ -1,2 +1,3 @@
1GRID_UNIT_PX=181GRID_UNIT_PX=18
2QTWEBKIT_DPR=2.02QTWEBKIT_DPR=2.0
3FORM_FACTOR=phone
34
=== added file 'upstart-session/bluez-mpris-proxy.conf'
--- upstart-session/bluez-mpris-proxy.conf 1970-01-01 00:00:00 +0000
+++ upstart-session/bluez-mpris-proxy.conf 2015-10-19 20:21:50 +0000
@@ -0,0 +1,9 @@
1description "BlueZ MPRIS proxy"
2author "Simon Fels <simon.fels@canonical.com>"
3
4start on started dbus
5stop on session-end
6
7respawn
8
9exec /usr/lib/bluetooth/mpris-proxy -s core.ubuntu.media.Service
010
=== modified file 'upstart-session/obexd.conf'
--- upstart-session/obexd.conf 2015-04-22 23:01:28 +0000
+++ upstart-session/obexd.conf 2015-10-19 20:21:50 +0000
@@ -7,4 +7,4 @@
7respawn7respawn
8expect fork8expect fork
99
10exec /usr/lib/obexd/obexd10exec /usr/lib/bluetooth/obexd -P ftp,irmc,mas,opp,pcsuite,filesystem -r $HOME

Subscribers

People subscribed via source and target branches