Merge lp:~cyphermox/mtp/lp1410506 into lp:mtp

[Mathieu Trudel-Lapierre]

Adjust start and stop conditions to properly handle USB connection *and*
disconnection, and to do the right thing at boot-time if USB is connected
already.

This means we need to handle the case where USB is *not* connected when
unity8 starts; by checking its state explicitly as the job starts.

Adjust start and stop conditions to properly handle USB connection *and*
disconnection, and to do the right thing at boot-time if USB is connected
already.

This means we need to handle the case where USB is *not* connected when
unity8 starts; by checking its state explicitly as the job starts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/mtp-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/29/rebuild

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

do you really want the mtp server to run if mtp is switched off for the gadget ?

i think you rather want:

start on (:sys:android-usb-connected and :sys:android-mtp-on) and (started unity8)

(you dont want it to start if unity8 isnt up because you cant get the screen lock state then, thus the "and (started unity8)")

[Mathieu Trudel-Lapierre (cyphermox)]

No, this is on purpose, so that things actually start up properly if you boot the device while connected to USB. Right now the mtp is always on in the gadget, we can revisit this and do further checking for the state if that changes.

Regardless of the events, half the time when we wait for the event or manually trigger them and unity8 is already started (with the and clause), the job does not start.

[lp:~cyphermox/mtp/lp1410506]

60. By Mathieu Trudel-Lapierre on 2015-01-19

Fix logic issue in DISCONNECTED state check

[Ricardo Salveti (rsalveti)]

LGTM, works fine when I get the usb-connected and disconnected events.

review: Approve

[lp:~cyphermox/mtp/lp1410506]

61. By Mathieu Trudel-Lapierre on 2015-01-20

Merge with trunk

=== modified file 'debian/mtp-server.conf'
--- debian/mtp-server.conf	2015-01-20 00:54:30 +0000
+++ debian/mtp-server.conf	2015-01-20 15:38:24 +0000
@@ -1,11 +1,16 @@
 description "MTP protocol server"
 
-start on (:sys:android-mtp-on or :sys:android-usb-connected or android-mtp-on or android-usb-connected) and (started unity8)
-stop on desktop-end or :sys:android-mtp-off or android-mtp-off
+start on :sys:android-usb-connected or android-usb-connected or :sys:android-mtp-on or android-mtp-on or started unity8
+stop on :sys:android-usb-disconnected or android-usb-disconnected or :sys:android-mtp-off or android-mtp-off or desktop-end
 
 pre-start script
     [ "$USER" != "lightdm" ] || { stop; exit 0; }
 
+    if grep -qc DISCONNECTED /sys/devices/virtual/android_usb/android0/state;
+    then
+        stop; exit 0;
+    fi
+
     # Fix for bug LP: #1389223: UnityGreeter isn't available immediately
     if ! dbus-send --session --print-reply \
             --dest=com.canonical.UnityGreeter \