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

[Kevin DuBois]

The code path to initialize nested display was going and opening up the display hardware functions (but not using them). This was causing problems because it meant older devices that can't open up the display hardware in more than one process were choking, and newer devices required 'video' group permissions to work. This changes things so that nested display doesn't access any display hardware

(LP: #1258056)

The code path to initialize nested display was going and opening up the display hardware functions (but not using them). This was causing problems because it meant older devices that can't open up the display hardware in more than one process were choking, and newer devices required 'video' group permissions to work. This changes things so that nested display doesn't access any display hardware

(LP: #1258056)

[Alexandros Frantzis (afrantzis)]

9 +mga::AndroidPlatform::AndroidPlatform(

We could just call the original AndroidPlatform(a,b) constructor directly, so adding a constructor that we want to remove seems unnecessary.

review: Needs Fixing

[Michael Terry (mterry)]

Just FYI, I've tested this on mako (worked great) and maguro (worked great). In each, it fixed a problem I was running into with nested mode.

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1273
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/504/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/230
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/230/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/233/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1274
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/507/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/236
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/236/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK for now. Clearly something about the dependencies needs sorting out.

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'src/platform/graphics/android/android_platform.cpp'
--- src/platform/graphics/android/android_platform.cpp	2013-12-02 16:48:04 +0000
+++ src/platform/graphics/android/android_platform.cpp	2013-12-05 16:36:47 +0000
@@ -119,11 +119,7 @@
 
 extern "C" std::shared_ptr<mg::NativePlatform> create_native_platform(std::shared_ptr<mg::DisplayReport> const& display_report)
 {
-    auto should_use_fb_fallback = false;
-    auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
-    auto fb_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(buffer_initializer);
-    auto display_resource_factory = std::make_shared<mga::ResourceFactory>();
-    auto display_builder = std::make_shared<mga::OutputBuilder>(
-        fb_allocator, display_resource_factory, display_report, should_use_fb_fallback);
-    return std::make_shared<mga::AndroidPlatform>(display_builder, display_report);
+    //TODO: remove nullptr parameter once platform classes are sorted.
+    //      mg::NativePlatform cannot create a display anyways, so it doesnt need a  display builder
+    return std::make_shared<mga::AndroidPlatform>(nullptr, display_report);
 }

=== modified file 'tests/unit-tests/graphics/android/test_android_platform.cpp'
--- tests/unit-tests/graphics/android/test_android_platform.cpp	2013-12-02 16:48:04 +0000
+++ tests/unit-tests/graphics/android/test_android_platform.cpp	2013-12-05 16:36:47 +0000
@@ -17,10 +17,12 @@
  */
 
 #include "mir/graphics/null_display_report.h"
+#include "mir/graphics/native_platform.h"
 #include "mir/graphics/buffer_ipc_packer.h"
 #include "mir/options/program_option.h"
 #include "src/platform/graphics/android/android_platform.h"
 #include "mir_test_doubles/mock_buffer.h"
+#include "mir_test_doubles/mock_android_hw.h"
 #include "mir_test_doubles/mock_buffer_packer.h"
 #include "mir_test_doubles/mock_display_report.h"
 #include "mir_test_doubles/stub_display_builder.h"
@@ -121,3 +123,18 @@
 
     EXPECT_EQ(EGL_DEFAULT_DISPLAY, platform.egl_native_display());
 }
+
+TEST(NestedPlatformCreation, doesnt_access_display_hardware)
+{
+    using namespace testing;
+
+    mtd::HardwareAccessMock hwaccess;
+    mtd::MockDisplayReport stub_report;
+
+    EXPECT_CALL(hwaccess, hw_get_module(StrEq(HWC_HARDWARE_MODULE_ID), _))
+        .Times(0);
+    EXPECT_CALL(hwaccess, hw_get_module(StrEq(GRALLOC_HARDWARE_MODULE_ID), _))
+        .Times(AtMost(1));
+
+    auto platform = mg::create_native_platform(mt::fake_shared(stub_report));
+}