Merge lp:~kdub/mir/fix-1471858 into lp:mir

[Kevin DuBois]

fixes lp: #1471858

android: fix a problem where a DisplayConfigurationPolicy could update the orientation without having DisplayBuffer::orientation() report the updated result.

fixes lp: #1471858

note: There's a bit of a DRY problem here with our interfaces, in that mg::DisplayConfigurationOutput has an orientation field, and we also have a mg::DisplayBuffer::orientation() that must be kept in-sync.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2736
http://jenkins.qa.ubuntu.com/job/mir-ci/4291/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3122
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/644/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/440
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3070
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3070/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5876
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21757

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

^seems a pkg resolver problem in ci, hopefully transient.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2736
http://jenkins.qa.ubuntu.com/job/mir-ci/4295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3127
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/649/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3075
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/444
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3075
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3075/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5881
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21766

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/platforms/android/server/display.cpp'
--- src/platforms/android/server/display.cpp	2015-06-17 05:20:42 +0000
+++ src/platforms/android/server/display.cpp	2015-07-09 13:08:33 +0000
@@ -126,7 +126,7 @@
         native_window,
         gl_context,
         *gl_program_factory,
-        mir_orientation_normal,
+        config.orientation,
         displacement,
         overlay_option));
 }

=== modified file 'tests/unit-tests/graphics/android/test_display.cpp'
--- tests/unit-tests/graphics/android/test_display.cpp	2015-06-25 03:00:08 +0000
+++ tests/unit-tests/graphics/android/test_display.cpp	2015-07-09 13:08:33 +0000
@@ -852,3 +852,48 @@
         EXPECT_THAT(disp_conf.top_left, Eq(another_new_location));
     });
 }
+
+//test for lp:1471858
+TEST_F(Display, applying_orientation_after_hotplug)
+{
+    using namespace testing;
+    std::function<void()> hotplug_fn = []{};
+    bool external_connected = false;
+    MirOrientation const orientation = mir_orientation_left;
+    stub_db_factory->with_next_config([&](mtd::MockHwcConfiguration& mock_config)
+    {
+        ON_CALL(mock_config, active_config_for(mga::DisplayName::primary))
+            .WillByDefault(Return(mtd::StubDisplayConfigurationOutput{
+                mg::DisplayConfigurationOutputId{0}, {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, true}));
+        ON_CALL(mock_config, active_config_for(mga::DisplayName::external))
+            .WillByDefault(Invoke([&](mga::DisplayName)
+            {
+                return mtd::StubDisplayConfigurationOutput{mg::DisplayConfigurationOutputId{1},
+                    {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, external_connected};
+            }));
+        EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))
+            .WillOnce(DoAll(SaveArg<0>(&hotplug_fn), Return(std::make_shared<char>('2'))));
+    });
+
+    mga::Display display(
+        stub_db_factory,
+        stub_gl_program_factory,
+        stub_gl_config,
+        null_display_report,
+        mga::OverlayOptimization::enabled);
+
+    //hotplug external back 
+    external_connected = true;
+    hotplug_fn();
+
+    auto config = display.configuration();
+    config->for_each_output([orientation](mg::UserDisplayConfigurationOutput& output) {
+        output.orientation = orientation;
+    });
+    display.configure(*config);
+    display.for_each_display_sync_group([orientation](mg::DisplaySyncGroup& group) {
+        group.for_each_display_buffer([orientation](mg::DisplayBuffer& db) {
+            EXPECT_THAT(db.orientation(), Eq(orientation)); 
+        });
+    });
+}