Merge lp:mir/0.20 into lp:mir/ubuntu

[Daniel van Vugt]

Bug fix release 0.20.1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3327
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/6039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5992
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5992/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8358
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27876
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/477
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/477/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/330
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27877

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

review: Approve (continuous-integration)

[lp:mir/0.20]

3328. By Andreas Pokorny on 2016-02-25

Add support for a wider range of mouse buttons, and ignore joystick buttons

Libinput currently only differs between keys and buttons. Buttons are always
treated as mouse buttons so we receive pointer button events in unexpected
cases. With this change the pointer events with outside of the common mouse
range are ignored. Changes in libinput are required to get proper gamepad or
joystick support.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3328
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/6040
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4947
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5996/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-amd64-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-xenial-i386-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5993
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5993/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8359/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27892

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

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Don't see anything wrong

review: Approve

[Daniel van Vugt (vanvugt)]

OK

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-12 10:51:29 +0000
+++ CMakeLists.txt	2016-02-25 11:58:41 +0000
@@ -29,7 +29,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 20)
-set(MIR_VERSION_PATCH 0)
+set(MIR_VERSION_PATCH 1)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-19 10:41:00 +0000
+++ debian/changelog	2016-02-25 11:58:41 +0000
@@ -1,3 +1,17 @@
+mir (0.20.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Kevin DuBois ]
+  * New upstream release 0.20.1 (https://launchpad.net/mir/+milestone/0.20.1)
+    - ABI summary:
+      . No ABI changes in any libraries. Bugfix release only.
+    - Bugs fixed:
+      . On arale; top panel drop down menu is semi-transparent and items are
+        unreadable. Accommodate system image device name change for arale
+        device that broke android quirk detection (LP: #1549226)
+      . Crash when side mouse buttons are pressed (LP: #1544878)
+
+ -- Kevin DuBois <[e-mail]>  Wed, 24 Feb 2016 08:33:20 -0500
+
 mir (0.20.0+16.04.20160219-0ubuntu1) xenial; urgency=medium
 
   [ Alan Griffiths ]
@@ -56,7 +70,7 @@
       . mouse pointer support on emulator is broken (LP: #1517597).
         [Cherrypicked from 0.21]
       . move an android-only test that ended up in tests/unit-tests/graphics.
-        (LP: ##1546676) [Cherrypicked from 0.21]
+        (LP: #1546676) [Cherrypicked from 0.21]
 
   [ CI Train Bot ]
   * No-change rebuild.

=== modified file 'include/client/mir_toolkit/events/input/pointer_event.h'
--- include/client/mir_toolkit/events/input/pointer_event.h	2016-01-29 08:18:22 +0000
+++ include/client/mir_toolkit/events/input/pointer_event.h	2016-02-25 11:58:41 +0000
@@ -77,7 +77,10 @@
     mir_pointer_button_secondary = 1 << 1,
     mir_pointer_button_tertiary  = 1 << 2,
     mir_pointer_button_back      = 1 << 3,
-    mir_pointer_button_forward   = 1 << 4
+    mir_pointer_button_forward   = 1 << 4,
+    mir_pointer_button_side      = 1 << 5,
+    mir_pointer_button_extra     = 1 << 6,
+    mir_pointer_button_task      = 1 << 7
 } MirPointerButton;
 typedef unsigned int MirPointerButtons;
 

=== modified file 'src/client/input/android/event_conversion_helpers.cpp'
--- src/client/input/android/event_conversion_helpers.cpp	2015-06-18 02:46:16 +0000
+++ src/client/input/android/event_conversion_helpers.cpp	2016-02-25 11:58:41 +0000
@@ -108,36 +108,18 @@
 
 MirPointerButtons mia::mir_pointer_buttons_from_android(int32_t android_state)
 {
-    MirPointerButtons buttons = 0;
-    
-    if (android_state & AMOTION_EVENT_BUTTON_PRIMARY)
-        buttons |= mir_pointer_button_primary;
-    if (android_state & AMOTION_EVENT_BUTTON_SECONDARY)
-        buttons |= mir_pointer_button_secondary;
-    if (android_state & AMOTION_EVENT_BUTTON_TERTIARY)
-        buttons |= mir_pointer_button_tertiary;
-    if (android_state & AMOTION_EVENT_BUTTON_BACK)
-        buttons |= mir_pointer_button_back;
-    if (android_state & AMOTION_EVENT_BUTTON_FORWARD)
-        buttons |= mir_pointer_button_forward;
-
-    return buttons;
+    static_assert(int32_t(mir_pointer_button_primary) == AMOTION_EVENT_BUTTON_PRIMARY &&
+                      int32_t(mir_pointer_button_secondary) == AMOTION_EVENT_BUTTON_SECONDARY &&
+                      int32_t(mir_pointer_button_tertiary) == AMOTION_EVENT_BUTTON_TERTIARY &&
+                      int32_t(mir_pointer_button_back) == AMOTION_EVENT_BUTTON_BACK &&
+                      int32_t(mir_pointer_button_forward) == AMOTION_EVENT_BUTTON_FORWARD,
+                  "pointer button enumeration out of sync with android definition");
+    return static_cast<MirPointerButtons>(android_state);
 }
 
 int32_t mia::android_pointer_buttons_from_mir(MirPointerButtons buttons)
 {
-    int32_t android_state = 0;
-    if (buttons & mir_pointer_button_primary)
-        android_state |= AMOTION_EVENT_BUTTON_PRIMARY;
-    if (buttons & mir_pointer_button_secondary)
-        android_state |= AMOTION_EVENT_BUTTON_SECONDARY;
-    if (buttons & mir_pointer_button_tertiary)
-        android_state |= AMOTION_EVENT_BUTTON_TERTIARY;
-    if (buttons & mir_pointer_button_back)
-        android_state |= AMOTION_EVENT_BUTTON_BACK;
-    if (buttons & mir_pointer_button_forward)
-        android_state |= AMOTION_EVENT_BUTTON_FORWARD;
-    return android_state;
+    return static_cast<int32_t>(buttons);
 }
 
 MirTouchTooltype mia::mir_tool_type_from_android(int32_t android_tooltype)
@@ -263,6 +245,9 @@
     if (buttons & mir_pointer_button_tertiary) ret++;
     if (buttons & mir_pointer_button_forward) ret++;
     if (buttons & mir_pointer_button_back) ret++;
+    if (buttons & mir_pointer_button_side) ret++;
+    if (buttons & mir_pointer_button_extra) ret++;
+    if (buttons & mir_pointer_button_task) ret++;
 
     return ret;
 }

=== modified file 'src/client/input/input_event.cpp'
--- src/client/input/input_event.cpp	2016-01-29 08:18:22 +0000
+++ src/client/input/input_event.cpp	2016-02-25 11:58:41 +0000
@@ -357,21 +357,7 @@
     MirPointerButton button)
 {
    auto const& old_mev = old_mev_from_new(pev);
-   switch (button)
-   {
-   case mir_pointer_button_primary:
-       return old_mev.buttons & mir_pointer_button_primary;
-   case mir_pointer_button_secondary:
-       return old_mev.buttons & mir_pointer_button_secondary;
-   case mir_pointer_button_tertiary:
-       return old_mev.buttons & mir_pointer_button_tertiary;
-   case mir_pointer_button_back:
-       return old_mev.buttons & mir_pointer_button_back;
-   case mir_pointer_button_forward:
-       return old_mev.buttons & mir_pointer_button_forward;
-   default:
-       return false;
-   }
+   return old_mev.buttons & button;
 }
 
 MirPointerButtons mir_pointer_event_buttons(MirPointerEvent const* pev)

=== modified file 'src/platforms/android/server/cmdstream_sync_factory.h'
--- src/platforms/android/server/cmdstream_sync_factory.h	2016-01-26 14:02:44 +0000
+++ src/platforms/android/server/cmdstream_sync_factory.h	2016-02-25 11:58:41 +0000
@@ -42,6 +42,12 @@
 {
     std::unique_ptr<CommandStreamSync> create_command_stream_sync() override;
 };
+
+class NullCommandStreamSyncFactory : public CommandStreamSyncFactory
+{
+    std::unique_ptr<CommandStreamSync> create_command_stream_sync() override;
+};
+
 }
 }
 }

=== modified file 'src/platforms/android/server/device_quirks.cpp'
--- src/platforms/android/server/device_quirks.cpp	2016-02-12 10:51:29 +0000
+++ src/platforms/android/server/device_quirks.cpp	2016-02-25 11:58:41 +0000
@@ -39,6 +39,12 @@
 char const* const gralloc_cannot_be_closed_safely_opt = "enable-gralloc-cannot-be-closed-safely-quirk";
 char const* const width_alignment_opt = "enable-width-alignment-quirk";
 char const* const fb_ion_heap_opt = "fb-ion-heap";
+char const* const working_egl_sync_opt = "use-eglsync-quirk";
+std::string const egl_sync_default = "default";
+std::string const egl_sync_force_on = "force_on";
+std::string const egl_sync_force_off = "force_off";
+ 
+
 std::string determine_device_name(mga::PropertiesWrapper const& properties)
 {
     char const default_value[] = "";
@@ -63,7 +69,7 @@
 
 bool clear_fb_context_fence_for(std::string const& device_name)
 {
-    return device_name == "krillin" || device_name == "mx4" || device_name == "manta";
+    return device_name == "krillin" || device_name == "arale" || device_name == "manta";
 }
 
 bool device_has_fb_ion_heap(std::string const& device_name, bool quirk_enabled)
@@ -71,6 +77,18 @@
     return quirk_enabled && (device_name != "Aquaris_M10_FHD");
 }
 
+bool device_has_working_egl_sync(std::string const& device_name, std::string const& option)
+{
+    if (option == egl_sync_force_on)
+        return true;
+    if (option == egl_sync_force_off)
+        return false;
+
+    if (device_name == "arale")
+        return false;
+    return true;
+}
+
 }
 
 mga::DeviceQuirks::DeviceQuirks(PropertiesWrapper const& properties)
@@ -79,7 +97,8 @@
       gralloc_cannot_be_closed_safely_(gralloc_cannot_be_closed_safely_for(device_name, true)),
       enable_width_alignment_quirk{true},
       clear_fb_context_fence_{clear_fb_context_fence_for(device_name)},
-      fb_ion_heap_{device_has_fb_ion_heap(device_name, true)}
+      fb_ion_heap_{device_has_fb_ion_heap(device_name, true)},
+      working_egl_sync_{device_has_working_egl_sync(device_name, egl_sync_default)}
 {
 }
 
@@ -89,7 +108,9 @@
       gralloc_cannot_be_closed_safely_(gralloc_cannot_be_closed_safely_for(device_name, options.get(gralloc_cannot_be_closed_safely_opt, true))),
       enable_width_alignment_quirk(options.get(width_alignment_opt, true)),
       clear_fb_context_fence_{clear_fb_context_fence_for(device_name)},
-      fb_ion_heap_{device_has_fb_ion_heap(device_name, options.get(fb_ion_heap_opt, true))}
+      fb_ion_heap_{device_has_fb_ion_heap(device_name, options.get(fb_ion_heap_opt, true))},
+      working_egl_sync_{device_has_working_egl_sync(
+        device_name, options.get(working_egl_sync_opt, egl_sync_default.c_str()))}
 {
 }
 
@@ -125,8 +146,7 @@
 
 bool mga::DeviceQuirks::working_egl_sync() const
 {
-    //FIXME: this really should be all powervr devices.
-    return device_name != "mx4";
+    return working_egl_sync_;
 }
 
 void mga::DeviceQuirks::add_options(boost::program_options::options_description& config)
@@ -143,6 +163,8 @@
           "[platform-specific] Enable width alignment (vegetahd quirk) [{true,false}]")
          (fb_ion_heap_opt,
           boost::program_options::value<bool>()->default_value(true),
-          "[platform-specific] device has ion heap for framebuffer allocation available [{true, false}]");
-
+          "[platform-specific] device has ion heap for framebuffer allocation available [{true, false}]")
+         (working_egl_sync_opt,
+          boost::program_options::value<std::string>()->default_value(egl_sync_default),
+          "[platform-specific] use KHR_reusable_sync extension [{default, force_on, force_off}]");
 }

=== modified file 'src/platforms/android/server/device_quirks.h'
--- src/platforms/android/server/device_quirks.h	2016-02-02 20:22:57 +0000
+++ src/platforms/android/server/device_quirks.h	2016-02-25 11:58:41 +0000
@@ -78,6 +78,7 @@
     bool const enable_width_alignment_quirk;
     bool const clear_fb_context_fence_;
     bool const fb_ion_heap_;
+    bool const working_egl_sync_; 
 };
 }
 }

=== modified file 'src/platforms/android/server/display_component_factory.h'
--- src/platforms/android/server/display_component_factory.h	2016-02-02 20:22:57 +0000
+++ src/platforms/android/server/display_component_factory.h	2016-02-25 11:58:41 +0000
@@ -30,6 +30,7 @@
 {
 class DisplayConfigurationOutput;
 class CommandStreamSync;
+class GraphicBufferAllocator;
 namespace android
 {
 class HwcConfiguration;
@@ -45,6 +46,7 @@
     virtual std::unique_ptr<HwcConfiguration> create_hwc_configuration() = 0;
     virtual std::unique_ptr<LayerList> create_layer_list() = 0;
 
+    virtual std::shared_ptr<graphics::GraphicBufferAllocator> the_buffer_allocator() = 0;
 protected:
     DisplayComponentFactory() = default;
     DisplayComponentFactory(DisplayComponentFactory const&) = delete;

=== modified file 'src/platforms/android/server/egl_sync_factory.cpp'
--- src/platforms/android/server/egl_sync_factory.cpp	2016-01-28 17:46:29 +0000
+++ src/platforms/android/server/egl_sync_factory.cpp	2016-02-25 11:58:41 +0000
@@ -33,3 +33,8 @@
         return std::make_unique<NullCommandSync>();
     }
 }
+
+std::unique_ptr<mg::CommandStreamSync> mga::NullCommandStreamSyncFactory::create_command_stream_sync()
+{
+    return std::make_unique<NullCommandSync>();
+}

=== modified file 'src/platforms/android/server/hal_component_factory.cpp'
--- src/platforms/android/server/hal_component_factory.cpp	2016-02-02 20:22:57 +0000
+++ src/platforms/android/server/hal_component_factory.cpp	2016-02-25 11:58:41 +0000
@@ -29,6 +29,8 @@
 #include "hwc_layers.h"
 #include "hwc_device.h"
 #include "hwc_fb_device.h"
+#include "android_graphic_buffer_allocator.h"
+#include "cmdstream_sync_factory.h"
 
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
@@ -38,16 +40,15 @@
 namespace geom = mir::geometry;
 
 mga::HalComponentFactory::HalComponentFactory(
-    std::shared_ptr<mga::GraphicBufferAllocator> const& buffer_allocator,
     std::shared_ptr<mga::DisplayResourceFactory> const& res_factory,
     std::shared_ptr<HwcReport> const& hwc_report,
     std::shared_ptr<mga::DeviceQuirks> const& quirks)
-    : buffer_allocator(buffer_allocator),
-      res_factory(res_factory),
+    : res_factory(res_factory),
       hwc_report(hwc_report),
       force_backup_display(false),
       num_framebuffers{quirks->num_framebuffers()},
-      working_egl_sync(quirks->working_egl_sync())
+      working_egl_sync(quirks->working_egl_sync()),
+      hwc_version{mga::HwcVersion::unknown}
 {
     try
     {
@@ -64,23 +65,29 @@
         //guarantee always 2 fb's allocated
         num_framebuffers = std::max(2u, static_cast<unsigned int>(fb_native->numFramebuffers));
     }
+
+    command_stream_sync_factory = create_command_stream_sync_factory();
+    buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(
+        command_stream_sync_factory, quirks);
 }
 
 std::unique_ptr<mg::CommandStreamSync> mga::HalComponentFactory::create_command_stream_sync()
 {
-    if (hwc_version == mga::HwcVersion::hwc10)
-        return std::make_unique<NullCommandSync>();
+    return command_stream_sync_factory->create_command_stream_sync();
+}
 
-    if (!working_egl_sync)
-        return std::make_unique<NullCommandSync>();
+std::unique_ptr<mga::CommandStreamSyncFactory> mga::HalComponentFactory::create_command_stream_sync_factory()
+{
+    if ((hwc_version == mga::HwcVersion::hwc10) || !working_egl_sync)
+        return std::make_unique<mga::NullCommandStreamSyncFactory>();
 
     try
     {
-        return std::make_unique<EGLSyncFence>(std::make_shared<mg::EGLSyncExtensions>());
+        return std::make_unique<mga::EGLSyncFactory>();
     }
     catch (std::runtime_error&)
     {
-        return std::make_unique<NullCommandSync>();
+        return std::make_unique<mga::NullCommandStreamSyncFactory>();
     }
 }
 
@@ -157,3 +164,8 @@
     else
         return std::unique_ptr<mga::HwcConfiguration>(new mga::HwcPowerModeControl(hwc_wrapper));
 }
+
+std::shared_ptr<mg::GraphicBufferAllocator> mga::HalComponentFactory::the_buffer_allocator()
+{
+    return buffer_allocator;
+}

=== modified file 'src/platforms/android/server/hal_component_factory.h'
--- src/platforms/android/server/hal_component_factory.h	2016-02-02 20:22:57 +0000
+++ src/platforms/android/server/hal_component_factory.h	2016-02-25 11:58:41 +0000
@@ -32,11 +32,13 @@
 {
 class FramebufferBundle;
 class DisplayResourceFactory;
-class GraphicBufferAllocator;
 class DisplayDevice;
 class HwcWrapper;
 class HwcReport;
 class DeviceQuirks;
+class CommandStreamSyncFactory;
+class AndroidGraphicBufferAllocator;
+
 
 //NOTE: this should be the only class that inspects the HWC version and assembles
 //the components accordingly
@@ -44,7 +46,6 @@
 {
 public:
     HalComponentFactory(
-        std::shared_ptr<GraphicBufferAllocator> const& buffer_allocator,
         std::shared_ptr<DisplayResourceFactory> const& res_factory,
         std::shared_ptr<HwcReport> const& hwc_report,
         std::shared_ptr<DeviceQuirks> const& quirks);
@@ -54,9 +55,11 @@
     std::unique_ptr<DisplayDevice> create_display_device() override;
     std::unique_ptr<HwcConfiguration> create_hwc_configuration() override;
     std::unique_ptr<LayerList> create_layer_list() override;
+    std::shared_ptr<graphics::GraphicBufferAllocator> the_buffer_allocator() override;
 
 private:
-    std::shared_ptr<GraphicBufferAllocator> const buffer_allocator;
+    std::unique_ptr<CommandStreamSyncFactory> create_command_stream_sync_factory();
+
     std::shared_ptr<DisplayResourceFactory> const res_factory;
     std::shared_ptr<HwcReport> const hwc_report;
 
@@ -68,6 +71,9 @@
     std::shared_ptr<HwcWrapper> hwc_wrapper;
     std::shared_ptr<framebuffer_device_t> fb_native;
     HwcVersion hwc_version;
+
+    std::shared_ptr<graphics::android::AndroidGraphicBufferAllocator> buffer_allocator;
+    std::shared_ptr<CommandStreamSyncFactory> command_stream_sync_factory;
 };
 
 }

=== modified file 'src/platforms/android/server/platform.cpp'
--- src/platforms/android/server/platform.cpp	2016-02-02 20:22:57 +0000
+++ src/platforms/android/server/platform.cpp	2016-02-25 11:58:41 +0000
@@ -86,13 +86,11 @@
 mga::Platform::Platform(
     std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator,
     std::shared_ptr<mga::DisplayComponentFactory> const& display_buffer_builder,
-    std::shared_ptr<CommandStreamSyncFactory> const& sync_factory,
     std::shared_ptr<mg::DisplayReport> const& display_report,
     mga::OverlayOptimization overlay_option,
     std::shared_ptr<mga::DeviceQuirks> const& quirks) :
     buffer_allocator(buffer_allocator),
     display_buffer_builder(display_buffer_builder),
-    sync_factory(sync_factory),
     display_report(display_report),
     quirks(quirks),
     overlay_option(overlay_option)
@@ -156,13 +154,13 @@
     auto overlay_option = should_use_overlay_optimization(*options);
     hwc_report->report_overlay_optimization(overlay_option);
     auto display_resource_factory = std::make_shared<mga::ResourceFactory>();
-    auto sync_factory = std::make_shared<mga::EGLSyncFactory>();
-    auto buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(sync_factory, quirks);
+
     auto component_factory = std::make_shared<mga::HalComponentFactory>(
-        buffer_allocator, display_resource_factory, hwc_report, quirks);
+        display_resource_factory, hwc_report, quirks);
 
     return mir::make_module_ptr<mga::Platform>(
-        buffer_allocator, component_factory, component_factory, display_report, overlay_option, quirks);
+        component_factory->the_buffer_allocator(),
+        component_factory, display_report, overlay_option, quirks);
 }
 
 mir::UniqueModulePtr<mg::Platform> create_guest_platform(
@@ -172,11 +170,17 @@
     mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform);
     //TODO: actually allow disabling quirks for guest platform
     auto quirks = std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{});
-    auto sync_factory = std::make_shared<mga::EGLSyncFactory>();
+
+    std::shared_ptr<mga::CommandStreamSyncFactory> sync_factory;
+    if (quirks->working_egl_sync())
+        sync_factory = std::make_shared<mga::EGLSyncFactory>();
+    else
+        sync_factory = std::make_shared<mga::NullCommandStreamSyncFactory>();
+
     //TODO: remove nullptr parameter once platform classes are sorted.
     //      mg::NativePlatform cannot create a display anyways, so it doesnt need a  display builder
     auto const buffer_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(sync_factory, quirks);
-    return mir::make_module_ptr<mga::Platform>(buffer_allocator, nullptr, sync_factory, display_report, mga::OverlayOptimization::disabled, quirks);
+    return mir::make_module_ptr<mga::Platform>(buffer_allocator, nullptr, display_report, mga::OverlayOptimization::disabled, quirks);
 }
 
 void add_graphics_platform_options(

=== modified file 'src/platforms/android/server/platform.h'
--- src/platforms/android/server/platform.h	2016-02-02 20:22:57 +0000
+++ src/platforms/android/server/platform.h	2016-02-25 11:58:41 +0000
@@ -41,7 +41,6 @@
     Platform(
         std::shared_ptr<graphics::GraphicBufferAllocator> const& buffer_allocator,
         std::shared_ptr<DisplayComponentFactory> const& display_buffer_builder,
-        std::shared_ptr<CommandStreamSyncFactory> const& sync_factory,
         std::shared_ptr<DisplayReport> const& display_report,
         OverlayOptimization overlay_option,
         std::shared_ptr<DeviceQuirks> const& quirks);
@@ -57,7 +56,6 @@
 private:
     std::shared_ptr<graphics::GraphicBufferAllocator> const buffer_allocator;
     std::shared_ptr<DisplayComponentFactory> const display_buffer_builder;
-    std::shared_ptr<CommandStreamSyncFactory> const sync_factory;
     std::shared_ptr<DisplayReport> const display_report;
     std::shared_ptr<PlatformIpcOperations> const ipc_operations;
     std::shared_ptr<DeviceQuirks> const quirks;

=== modified file 'src/platforms/evdev/button_utils.cpp'
--- src/platforms/evdev/button_utils.cpp	2015-10-20 05:34:31 +0000
+++ src/platforms/evdev/button_utils.cpp	2016-02-25 11:58:41 +0000
@@ -38,6 +38,9 @@
     case BTN_MIDDLE: return mir_pointer_button_tertiary;
     case BTN_BACK: return mir_pointer_button_back;
     case BTN_FORWARD: return mir_pointer_button_forward;
+    case BTN_SIDE: return mir_pointer_button_side;
+    case BTN_EXTRA: return mir_pointer_button_extra;
+    case BTN_TASK: return mir_pointer_button_task;
     }
     BOOST_THROW_EXCEPTION(std::runtime_error("Invalid mouse button"));
 }

=== modified file 'src/platforms/evdev/libinput_device.cpp'
--- src/platforms/evdev/libinput_device.cpp	2016-01-29 08:18:22 +0000
+++ src/platforms/evdev/libinput_device.cpp	2016-02-25 11:58:41 +0000
@@ -32,10 +32,13 @@
 #include "mir/geometry/displacement.h"
 #include "mir/dispatch/dispatchable.h"
 #include "mir/fd.h"
+#define MIR_LOG_COMPONENT "evdev"
+#include "mir/log.h"
 
 #include <libinput.h>
 #include <linux/input.h>  // only used to get constants for input reports
 
+#include <boost/exception/diagnostic_information.hpp>
 #include <cstring>
 #include <chrono>
 #include <sstream>
@@ -84,41 +87,48 @@
     if (!sink)
         return;
 
-    switch(libinput_event_get_type(event))
-    {
-    case LIBINPUT_EVENT_KEYBOARD_KEY:
-        sink->handle_input(*convert_event(libinput_event_get_keyboard_event(event)));
-        break;
-    case LIBINPUT_EVENT_POINTER_MOTION:
-        sink->handle_input(*convert_motion_event(libinput_event_get_pointer_event(event)));
-        break;
-    case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
-        sink->handle_input(*convert_absolute_motion_event(libinput_event_get_pointer_event(event)));
-        break;
-    case LIBINPUT_EVENT_POINTER_BUTTON:
-        sink->handle_input(*convert_button_event(libinput_event_get_pointer_event(event)));
-        break;
-    case LIBINPUT_EVENT_POINTER_AXIS:
-        sink->handle_input(*convert_axis_event(libinput_event_get_pointer_event(event)));
-        break;
-    // touch events are processed as a batch of changes over all touch pointts
-    case LIBINPUT_EVENT_TOUCH_DOWN:
-        handle_touch_down(libinput_event_get_touch_event(event));
-        break;
-    case LIBINPUT_EVENT_TOUCH_UP:
-        handle_touch_up(libinput_event_get_touch_event(event));
-        break;
-    case LIBINPUT_EVENT_TOUCH_MOTION:
-        handle_touch_motion(libinput_event_get_touch_event(event));
-        break;
-    case LIBINPUT_EVENT_TOUCH_CANCEL:
-        // Not yet provided by libinput.
-        break;
-    case LIBINPUT_EVENT_TOUCH_FRAME:
-        sink->handle_input(*convert_touch_frame(libinput_event_get_touch_event(event)));
-        break;
-    default:
-        break;
+    try
+    {
+        switch(libinput_event_get_type(event))
+        {
+        case LIBINPUT_EVENT_KEYBOARD_KEY:
+            sink->handle_input(*convert_event(libinput_event_get_keyboard_event(event)));
+            break;
+        case LIBINPUT_EVENT_POINTER_MOTION:
+            sink->handle_input(*convert_motion_event(libinput_event_get_pointer_event(event)));
+            break;
+        case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
+            sink->handle_input(*convert_absolute_motion_event(libinput_event_get_pointer_event(event)));
+            break;
+        case LIBINPUT_EVENT_POINTER_BUTTON:
+            sink->handle_input(*convert_button_event(libinput_event_get_pointer_event(event)));
+            break;
+        case LIBINPUT_EVENT_POINTER_AXIS:
+            sink->handle_input(*convert_axis_event(libinput_event_get_pointer_event(event)));
+            break;
+        // touch events are processed as a batch of changes over all touch pointts
+        case LIBINPUT_EVENT_TOUCH_DOWN:
+            handle_touch_down(libinput_event_get_touch_event(event));
+            break;
+        case LIBINPUT_EVENT_TOUCH_UP:
+            handle_touch_up(libinput_event_get_touch_event(event));
+            break;
+        case LIBINPUT_EVENT_TOUCH_MOTION:
+            handle_touch_motion(libinput_event_get_touch_event(event));
+            break;
+        case LIBINPUT_EVENT_TOUCH_CANCEL:
+            // Not yet provided by libinput.
+            break;
+        case LIBINPUT_EVENT_TOUCH_FRAME:
+            sink->handle_input(*convert_touch_frame(libinput_event_get_touch_event(event)));
+            break;
+        default:
+            break;
+        }
+    }
+    catch(std::exception const& error)
+    {
+        mir::log_error("Failure processing input event received from libinput: " + boost::diagnostic_information(error));
     }
 }
 

=== modified file 'tests/include/mir/test/doubles/stub_display_builder.h'
--- tests/include/mir/test/doubles/stub_display_builder.h	2016-02-02 20:22:57 +0000
+++ tests/include/mir/test/doubles/stub_display_builder.h	2016-02-25 11:58:41 +0000
@@ -94,6 +94,11 @@
     {
     }
 
+    std::shared_ptr<graphics::GraphicBufferAllocator> the_buffer_allocator()
+    {
+        return nullptr;
+    }
+
     std::unique_ptr<graphics::android::LayerList> create_layer_list()
     {
         return std::unique_ptr<graphics::android::LayerList>(

=== modified file 'tests/unit-tests/graphics/android/test_device_detection.cpp'
--- tests/unit-tests/graphics/android/test_device_detection.cpp	2016-02-12 10:51:29 +0000
+++ tests/unit-tests/graphics/android/test_device_detection.cpp	2016-02-25 11:58:41 +0000
@@ -136,14 +136,14 @@
 {
     using namespace testing;
     char const default_str[] = "";
-    char const mx4_name_str[] = "manta";
+    char const manta_name_str[] = "manta";
 
     MockOps mock_ops;
     EXPECT_CALL(mock_ops, property_get(StrEq("ro.product.device"), _, StrEq(default_str)))
         .Times(1)
         .WillOnce(Invoke([&](char const*, char* value, char const*)
         {
-            strncpy(value, mx4_name_str, PROP_VALUE_MAX);
+            strncpy(value, manta_name_str, PROP_VALUE_MAX);
             return 0;
         }));
 
@@ -151,18 +151,18 @@
     EXPECT_TRUE(quirks.clear_fb_context_fence());
 }
 
-TEST(DeviceDetection, clears_gl_context_fence_on_mx4)
+TEST(DeviceDetection, clears_gl_context_fence_on_arale)
 {
     using namespace testing;
     char const default_str[] = "";
-    char const mx4_name_str[] = "mx4";
+    char const arale_name_str[] = "arale";
 
     MockOps mock_ops;
     EXPECT_CALL(mock_ops, property_get(StrEq("ro.product.device"), _, StrEq(default_str)))
         .Times(1)
         .WillOnce(Invoke([&](char const*, char* value, char const*)
         {
-            strncpy(value, mx4_name_str, PROP_VALUE_MAX);
+            strncpy(value, arale_name_str, PROP_VALUE_MAX);
             return 0;
         }));
 
@@ -193,14 +193,14 @@
 {
     using namespace testing;
     char const default_str[] = "";
-    char const mx4_name_str[] = "others";
+    char const other_name_str[] = "others";
 
     MockOps mock_ops;
     EXPECT_CALL(mock_ops, property_get(StrEq("ro.product.device"), _, StrEq(default_str)))
         .Times(1)
         .WillOnce(Invoke([&](char const*, char* value, char const*)
         {
-            strncpy(value, mx4_name_str, PROP_VALUE_MAX);
+            strncpy(value, other_name_str, PROP_VALUE_MAX);
             return 0;
         }));
 

=== modified file 'tests/unit-tests/graphics/android/test_display_hotplug.cpp'
--- tests/unit-tests/graphics/android/test_display_hotplug.cpp	2016-02-02 20:22:57 +0000
+++ tests/unit-tests/graphics/android/test_display_hotplug.cpp	2016-02-25 11:58:41 +0000
@@ -108,6 +108,11 @@
             return nullptr;
         }
 
+        std::shared_ptr<mg::GraphicBufferAllocator> the_buffer_allocator()
+        {
+            return nullptr;
+        }
+
         StubHwcConfig stub_config;
     };
 

=== modified file 'tests/unit-tests/graphics/android/test_output_builder.cpp'
--- tests/unit-tests/graphics/android/test_output_builder.cpp	2016-02-15 11:57:49 +0000
+++ tests/unit-tests/graphics/android/test_output_builder.cpp	2016-02-25 11:58:41 +0000
@@ -97,7 +97,6 @@
     testing::NiceMock<mtd::MockFBHalDevice> fb_hal_mock;
     std::shared_ptr<MockResourceFactory> mock_resource_factory;
     testing::NiceMock<mtd::MockDisplayReport> mock_display_report;
-    testing::NiceMock<MockGraphicBufferAllocator> mock_buffer_allocator;
     std::shared_ptr<mtd::MockHwcReport> mock_hwc_report{
         std::make_shared<testing::NiceMock<mtd::MockHwcReport>>()};
     std::shared_ptr<mtd::MockHWCDeviceWrapper> mock_wrapper;
@@ -114,7 +113,6 @@
     EXPECT_CALL(*mock_hwc_report, report_hwc_version(mga::HwcVersion::hwc10));
 
     mga::HalComponentFactory factory(
-        mt::fake_shared(mock_buffer_allocator),
         mock_resource_factory,
         mock_hwc_report,
         quirks);
@@ -129,7 +127,6 @@
     EXPECT_CALL(*mock_hwc_report, report_hwc_version(mga::HwcVersion::hwc11));
 
     mga::HalComponentFactory factory(
-        mt::fake_shared(mock_buffer_allocator),
         mock_resource_factory,
         mock_hwc_report,
         quirks);
@@ -143,7 +140,6 @@
         .WillOnce(Return(std::make_tuple(mock_wrapper, mga::HwcVersion::hwc14)));
 
     mga::HalComponentFactory factory(
-        mt::fake_shared(mock_buffer_allocator),
         mock_resource_factory,
         mock_hwc_report,
         quirks);
@@ -160,7 +156,6 @@
     EXPECT_CALL(*mock_hwc_report, report_legacy_fb_module());
 
     mga::HalComponentFactory factory(
-        mt::fake_shared(mock_buffer_allocator),
         mock_resource_factory,
         mock_hwc_report,
         quirks);
@@ -177,7 +172,6 @@
 
     EXPECT_THROW({
         mga::HalComponentFactory factory(
-            mt::fake_shared(mock_buffer_allocator),
             mock_resource_factory,
             mock_hwc_report,
             quirks);
@@ -193,13 +187,16 @@
     EXPECT_CALL(*mock_resource_factory, create_fb_native_device())
         .WillOnce(Return(std::make_shared<mtd::MockFBHalDevice>(
             0, 0, mir_pixel_format_abgr_8888, 0, 0.0, 0.0)));
-    EXPECT_CALL(mock_buffer_allocator, alloc_buffer_platform(_,_,_))
-        .Times(2);
 
     mga::HalComponentFactory factory(
-        mt::fake_shared(mock_buffer_allocator),
         mock_resource_factory,
         mock_hwc_report,
         quirks);
-    factory.create_framebuffers(mtd::StubDisplayConfig(1).outputs[0]);
+    auto fbs = factory.create_framebuffers(mtd::StubDisplayConfig(1).outputs[0]);
+    std::vector<mg::BufferID> buffer_list;
+    for(auto i = 0u; i < 10u; i++)
+        buffer_list.push_back(fbs->buffer_for_render()->id());
+    std::sort(buffer_list.begin(), buffer_list.end());
+    buffer_list.erase(std::unique(buffer_list.begin(), buffer_list.end()), buffer_list.end());
+    EXPECT_THAT(buffer_list.size(), Eq(2));
 }

=== modified file 'tests/unit-tests/graphics/android/test_platform.cpp'
--- tests/unit-tests/graphics/android/test_platform.cpp	2016-02-02 20:22:57 +0000
+++ tests/unit-tests/graphics/android/test_platform.cpp	2016-02-25 11:58:41 +0000
@@ -26,7 +26,6 @@
 #include "mir/test/doubles/mock_display_report.h"
 #include "mir/test/doubles/mock_egl.h"
 #include "mir/test/doubles/stub_display_builder.h"
-#include "mir/test/doubles/stub_cmdstream_sync_factory.h"
 #include "mir/test/doubles/fd_matcher.h"
 #include "mir/test/fake_shared.h"
 #include "mir/test/doubles/mock_android_native_buffer.h"
@@ -55,7 +54,6 @@
         using namespace testing;
 
         stub_display_builder = std::make_shared<mtd::StubDisplayBuilder>();
-        stub_sync_factory = std::make_shared<mtd::StubCmdStreamSyncFactory>();
         stub_display_report = mr::null_display_report();
         stride = geom::Stride(300*4);
 
@@ -88,7 +86,6 @@
     std::shared_ptr<mtd::MockAndroidNativeBuffer> native_buffer;
     std::shared_ptr<mtd::StubBufferAllocator> stub_buffer_allocator;
     std::shared_ptr<mtd::StubDisplayBuilder> stub_display_builder;
-    std::shared_ptr<mtd::StubCmdStreamSyncFactory> stub_sync_factory;
     std::shared_ptr<mtd::MockBuffer> mock_buffer;
     std::shared_ptr<native_handle_t> native_buffer_handle;
     std::shared_ptr<mg::DisplayReport> stub_display_report;
@@ -107,7 +104,7 @@
         .WillOnce(Return(fake_fence));
 
     mga::Platform platform(stub_buffer_allocator, stub_display_builder,
-        stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks);
+        stub_display_report, mga::OverlayOptimization::enabled, quirks);
 
     mtd::MockBufferIpcMessage mock_ipc_msg;
     int offset = 0;
@@ -140,7 +137,7 @@
         .WillOnce(Return(-1));
 
     mga::Platform platform(stub_buffer_allocator, stub_display_builder,
-        stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks);
+        stub_display_report, mga::OverlayOptimization::enabled, quirks);
 
     mtd::MockBufferIpcMessage mock_ipc_msg;
     int offset = 0;
@@ -181,7 +178,7 @@
         .WillOnce(Return(-1));
 
     mga::Platform platform(stub_buffer_allocator, stub_display_builder,
-        stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks);
+        stub_display_report, mga::OverlayOptimization::enabled, quirks);
 
     mtd::MockBufferIpcMessage mock_ipc_msg;
     int offset = 0;
@@ -217,7 +214,7 @@
 
     int fake_fence{33};
     mga::Platform platform(stub_buffer_allocator, stub_display_builder,
-        stub_sync_factory, stub_display_report, mga::OverlayOptimization::enabled, quirks);
+        stub_display_report, mga::OverlayOptimization::enabled, quirks);
     auto ipc_ops = platform.make_ipc_operations();
 
     mtd::MockBufferIpcMessage mock_ipc_msg;
@@ -244,7 +241,6 @@
     mga::Platform platform(
         std::make_shared<mtd::StubBufferAllocator>(),
         std::make_shared<mtd::StubDisplayBuilder>(),
-        std::make_shared<mtd::StubCmdStreamSyncFactory>(),
         mr::null_display_report(),
         mga::OverlayOptimization::enabled,
         std::make_shared<mga::DeviceQuirks>(mga::PropertiesOps{}));

=== modified file 'tests/unit-tests/graphics/android/test_server_interpreter.cpp'
--- tests/unit-tests/graphics/android/test_server_interpreter.cpp	2016-01-29 08:18:22 +0000
+++ tests/unit-tests/graphics/android/test_server_interpreter.cpp	2016-02-25 11:58:41 +0000
@@ -39,11 +39,11 @@
 
 namespace
 {
-//krillin and mx4 need to clear their fences before hwc commit.
+//krillin and arale need to clear their fences before hwc commit.
 struct StubPropertiesWrapper : mga::PropertiesWrapper
 {
     StubPropertiesWrapper(bool should_clear_fence) :
-        name(should_clear_fence ? "mx4" : "otherdevice")
+        name(should_clear_fence ? "arale" : "otherdevice")
     {
     }
 

=== modified file 'tests/unit-tests/input/evdev/test_libinput_device.cpp'
--- tests/unit-tests/input/evdev/test_libinput_device.cpp	2016-01-29 08:18:22 +0000
+++ tests/unit-tests/input/evdev/test_libinput_device.cpp	2016-02-25 11:58:41 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "src/platforms/evdev/libinput_device.h"
+#include "src/platforms/evdev/button_utils.h"
 #include "src/server/report/null_report_factory.h"
 #include "src/server/input/default_event_builder.h"
 
@@ -636,6 +637,40 @@
     mouse.process_event(fake_event_4);
 }
 
+TEST_F(LibInputDeviceOnMouse, process_event_handles_exotic_mouse_buttons)
+{
+    float const x = 0;
+    float const y = 0;
+    geom::Point const pos{x, y};
+
+    InSequence seq;
+    EXPECT_CALL(mock_sink, handle_input(mt::ButtonDownEventWithButton(pos, mir_pointer_button_side)));
+    EXPECT_CALL(mock_sink, handle_input(mt::ButtonDownEventWithButton(pos, mir_pointer_button_extra)));
+    EXPECT_CALL(mock_sink, handle_input(mt::ButtonDownEventWithButton(pos, mir_pointer_button_task)));
+
+    setup_button_event(fake_event_1, event_time_1, BTN_SIDE, LIBINPUT_BUTTON_STATE_PRESSED);
+    setup_button_event(fake_event_2, event_time_2, BTN_EXTRA, LIBINPUT_BUTTON_STATE_PRESSED);
+    setup_button_event(fake_event_3, event_time_3, BTN_TASK, LIBINPUT_BUTTON_STATE_PRESSED);
+
+    mouse.start(&mock_sink, &mock_builder);
+    mouse.process_event(fake_event_1);
+    mouse.process_event(fake_event_2);
+    mouse.process_event(fake_event_3);
+}
+
+TEST_F(LibInputDeviceOnMouse, process_ignores_events_when_button_conversion_fails)
+{
+    EXPECT_THROW({mir::input::evdev::to_pointer_button(BTN_JOYSTICK, mir_pointer_handedness_right);},
+                 std::runtime_error);
+
+    InSequence seq;
+    EXPECT_CALL(mock_sink, handle_input(_)).Times(0);
+
+    setup_button_event(fake_event_1, event_time_3, BTN_JOYSTICK, LIBINPUT_BUTTON_STATE_PRESSED);
+    mouse.start(&mock_sink, &mock_builder);
+    mouse.process_event(fake_event_1);
+}
+
 TEST_F(LibInputDeviceOnMouse, process_event_handles_scroll)
 {
     setup_axis_event(fake_event_1, event_time_1, 0.0, 20.0);