Merge lp:~morphis/ubuntu-touch-session/sync-vivid-and-droid-discover into lp:ubuntu-touch-session

[Simon Fels]

Sync with changes from vivid overlay ppa and enable PulseAudio Droid discover module.

Sync with changes from vivid overlay ppa and enable PulseAudio Droid discover module.

=== modified file 'touch.pa'
--- touch.pa	2015-08-07 15:24:48 +0000
+++ touch.pa	2016-01-14 12:33:34 +0000
@@ -38,8 +38,8 @@
 load-module module-switch-on-connect skip_abstract=yes
 
 ### Automatically load the Pulseaudio Droid
-.ifexists module-droid-card.so
-load-module module-droid-card voice_virtual_stream=true
+.ifexists module-droid-discover.so
+load-module module-droid-discover voice_virtual_stream=true
 .endif
 
 ### Automatically load the trust-store module
@@ -68,8 +68,8 @@
 load-module module-bluetooth-policy
 .endif
 
-.ifexists module-bluez4-discover.so
-load-module module-bluez4-discover profile=a2dp sco_sink=sink.fake.sco sco_source=source.fake.sco
+.ifexists module-bluez5-discover.so
+load-module module-bluez5-discover headset=both profile=a2dp_sink sco_sink=sink.fake.sco sco_source=source.fake.sco
 .endif
 
 ### Load several protocols

=== 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	2016-01-14 12:33:34 +0000
@@ -1,3 +1,4 @@
 GRID_UNIT_PX=18
 QTWEBKIT_DPR=2.0
 NATIVE_ORIENTATION=landscape
+FORM_FACTOR=tablet

=== 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	2016-01-14 12:33:34 +0000
@@ -1,2 +1,3 @@
 GRID_UNIT_PX=18
 QTWEBKIT_DPR=2.0
+FORM_FACTOR=phone

=== 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	2016-01-14 12:33:34 +0000
@@ -0,0 +1,9 @@
+description "BlueZ MPRIS proxy"
+author "Simon Fels <[e-mail]>"
+
+start on started dbus
+stop on session-end
+
+respawn
+
+exec /usr/lib/bluetooth/mpris-proxy -s core.ubuntu.media.Service

=== added file 'upstart-session/cameraservice-trust-stored.conf'
--- upstart-session/cameraservice-trust-stored.conf	1970-01-01 00:00:00 +0000
+++ upstart-session/cameraservice-trust-stored.conf	2016-01-14 12:33:34 +0000
@@ -0,0 +1,33 @@
+description "CameraService Trust Store Daemon"
+
+start on started dbus and xsession SESSION=ubuntu-touch
+stop on runlevel [06]
+
+respawn
+
+script
+    timeout=800
+    service_socket=/dev/socket/camera_service/camera_service_to_trust
+    # loop and then exit, if camera service isnt up after 80 sec
+    # it is likely not starting at all (or not there)
+    while [ ! -e $service_socket ]; do
+        sleep 0.1
+        if [ "$timeout" -le 0 ]; then
+            stop; exit 0
+        fi
+        timeout=$(($timeout - 1))
+    done
+
+    # Extra security to make sure the service is bound to the sockec
+    # TODO check if needed by inspection of trust store library / camera service
+    sleep 1
+
+    exec /usr/bin/trust-stored-skeleton \
+        --remote-agent UnixDomainSocketRemoteAgent --endpoint=$service_socket \
+        --local-agent MirAgent \
+        --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
+        --for-service CameraService \
+        --with-text-domain CameraService \
+        --store-bus session \
+        --disable-whitelisting=yes
+end script

=== renamed file 'upstart-session/cameraservice-trust-stored.conf' => 'upstart-session/cameraservice-trust-stored.conf.moved'
=== modified file 'upstart-session/obexd.conf'
--- upstart-session/obexd.conf	2015-04-22 23:01:28 +0000
+++ upstart-session/obexd.conf	2016-01-14 12:33:34 +0000
@@ -7,4 +7,4 @@
 respawn
 expect fork
 
-exec /usr/lib/obexd/obexd
+exec /usr/lib/bluetooth/obexd -P ftp,irmc,mas,opp,pcsuite,filesystem -r $HOME

=== added file 'upstart-session/pulseaudio-trust-stored.conf'
--- upstart-session/pulseaudio-trust-stored.conf	1970-01-01 00:00:00 +0000
+++ upstart-session/pulseaudio-trust-stored.conf	2016-01-14 12:33:34 +0000
@@ -0,0 +1,21 @@
+description "Pulseaudio Trust Store Daemon"
+
+start on started pulseaudio
+stop on stopped pulseaudio
+
+respawn
+
+script
+    # Extra security until trust-stored handles DBus name owner changes
+    # for the service
+    sleep 2
+
+    exec /usr/bin/trust-stored-skeleton \
+        --remote-agent DBusRemoteAgent --bus=session \
+        --local-agent MirAgent \
+        --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
+        --for-service PulseAudio \
+        --with-text-domain PulseAudio \
+        --store-bus session \
+        --disable-whitelisting=yes
+end script

=== renamed file 'upstart-session/pulseaudio-trust-stored.conf' => 'upstart-session/pulseaudio-trust-stored.conf.moved'