Merge lp:~mzanetti/ubuntu-system-settings/bt-input into lp:ubuntu-system-settings

[Michael Zanetti]

Enable support for Bluetooth Input devices

I haven't managed to properly test this yet as BlueZ seems to crash when establishing the HIDP connection. However, with this I can successfully pair a BT keyboard using the settings app.

Trying to do the same setup manually using bluez-simple-agent and dbus calls to connect the Input interface manually results in the same BlueZ crash, so I'm confident this branch is ok. We might still want to wait with landing until the BlueZ issue is resolved.

[Sebastien Bacher (seb128)]

Thanks for the work. Seems fine to me, but note that https://code.launchpad.net/~mathieu-tl/ubuntu-system-settings/unbreak-hid/+merge/243592 was recently proposed that drops the device type limitation, if that goes in you might need to rebase your changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1223
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1841/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/508/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/111
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/441/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/506
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16487

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1841/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/ubuntu-system-settings/bt-input]

1224. By Michael Zanetti on 2014-12-12

merte trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1224
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1855/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/125
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/559
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/559/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16569

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1855/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2014-12-03 20:34:39 +0000
+++ plugins/bluetooth/bluetooth.cpp	2014-12-12 21:00:48 +0000
@@ -148,6 +148,10 @@
         case Device::Type::Carkit:
             m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
             break;
+        case Device::Type::Keyboard:
+        case Device::Type::Mouse:
+            m_selectedDevice->disconnect(Device::ConnectionMode::Input);
+            break;
         default:
             qWarning() << "Nothing to disconnect: Unsupported device type.";
             break;
@@ -177,6 +181,10 @@
     case Device::Type::Carkit:
         connMode = Device::ConnectionMode::Audio;
         break;
+    case Device::Type::Keyboard:
+    case Device::Type::Mouse:
+        connMode = Device::ConnectionMode::Input;
+        break;
     default:
         qWarning() << "Nothing to connect: Unsupported device type.";
         return;

=== modified file 'plugins/bluetooth/device.cpp'
--- plugins/bluetooth/device.cpp	2014-08-28 07:22:28 +0000
+++ plugins/bluetooth/device.cpp	2014-12-12 21:00:48 +0000
@@ -59,6 +59,7 @@
     initInterface(m_audioSourceInterface, path, "org.bluez.AudioSource", bus);
     initInterface(m_audioSinkInterface,   path, "org.bluez.AudioSink",   bus);
     initInterface(m_headsetInterface,     path, "org.bluez.Headset",     bus);
+    initInterface(m_inputInterface,       path, "org.bluez.Input",       bus);
 
     Q_EMIT(pathChanged());
 }
@@ -190,6 +191,8 @@
         interface = m_headsetInterface;
     else if (m_audioInterface && (mode == Audio))
         interface = m_audioInterface;
+    else if (m_inputInterface && (mode == Input))
+        interface = m_inputInterface;
     else {
         qWarning() << "Unhandled connection mode" << mode;
         return;
@@ -206,6 +209,8 @@
         interface = m_headsetInterface;
     else if (m_audioInterface && (mode == Audio))
         interface = m_audioInterface;
+    else if (m_inputInterface && (mode == Input))
+        interface = m_inputInterface;
     else {
         qWarning() << "Unhandled connection mode" << mode;
         return;

=== modified file 'plugins/bluetooth/device.h'
--- plugins/bluetooth/device.h	2014-08-11 09:32:31 +0000
+++ plugins/bluetooth/device.h	2014-12-12 21:00:48 +0000
@@ -125,6 +125,7 @@
     QSharedPointer<QDBusInterface> m_audioSourceInterface;
     QSharedPointer<QDBusInterface> m_audioSinkInterface;
     QSharedPointer<QDBusInterface> m_headsetInterface;
+    QSharedPointer<QDBusInterface> m_inputInterface;
     QList<ConnectionMode> m_connectAfterPairing;
 
   protected: