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

[Kevin DuBois]

android: do not propogate errors when initially turning on the display, as some of the rc's from the driver indicate that the display is already in the state that was requested.

fixes: lp: #1345533

android: do not propogate errors when initially turning on the display, as some of the rc's from the driver indicate that the display is already in the state that was requested.

fixes: lp: #1345533

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1783
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1019
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1013
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/726/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/727
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/727/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3454
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2138
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10169

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2204/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/platform/graphics/android/hwc_common_device.cpp'
--- src/platform/graphics/android/hwc_common_device.cpp	2014-06-25 22:34:19 +0000
+++ src/platform/graphics/android/hwc_common_device.cpp	2014-07-21 17:41:31 +0000
@@ -56,7 +56,14 @@
 
     hwc_device->register_hooks(&callbacks.hooks);
 
-    turn_screen_on();
+    try
+    {
+        turn_screen_on();
+    } catch (...)
+    {
+        //TODO: log failure here. some drivers will throw if the screen is already on, which
+        //      is not a fatal condition
+    }
 }
 
 mga::HWCCommonDevice::~HWCCommonDevice() noexcept

=== modified file 'tests/unit-tests/graphics/android/test_hwc_common_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc_common_device.cpp	2014-06-25 22:34:19 +0000
+++ tests/unit-tests/graphics/android/test_hwc_common_device.cpp	2014-07-21 17:41:31 +0000
@@ -192,3 +192,21 @@
     auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
     EXPECT_FALSE(device->apply_orientation(mir_orientation_left));
 }
+
+TYPED_TEST(HWCCommon, first_unblank_failure_is_not_fatal) //lp:1345533
+{
+    ON_CALL(*this->mock_device, display_on())
+        .WillByDefault(testing::Throw(std::runtime_error("error")));
+    EXPECT_NO_THROW({
+        auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
+    });
+}
+
+TYPED_TEST(HWCCommon, first_vsync_failure_is_not_fatal) //lp:1345533
+{
+    ON_CALL(*this->mock_device, vsync_signal_on())
+        .WillByDefault(testing::Throw(std::runtime_error("error")));
+    EXPECT_NO_THROW({
+        auto device = make_hwc_device<TypeParam>(this->mock_device, this->mock_fbdev, this->mock_vsync);
+    });
+}