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

[Kevin DuBois]

android: report 2 as the max_simultaneous_output field of mg::DisplayConfigurtionCard now that an external display can be present.

fixes: lp: #1446304

android: report 2 as the max_simultaneous_output field of mg::DisplayConfigurtionCard now that an external display can be present.

fixes: lp: #1446304

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2500
http://jenkins.qa.ubuntu.com/job/mir-ci/3572/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1569
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1569/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2070
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2070/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5002
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19803

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'src/platforms/android/server/display_configuration.cpp'
--- src/platforms/android/server/display_configuration.cpp	2015-04-09 06:20:31 +0000
+++ src/platforms/android/server/display_configuration.cpp	2015-04-20 17:02:35 +0000
@@ -23,8 +23,12 @@
 
 namespace
 {
-int const primary_id{0};
-int const external_id{1};
+enum DisplayIds
+{
+    primary_id,
+    external_id,
+    max_displays
+};
 }
 
 mga::DisplayConfiguration::DisplayConfiguration(
@@ -36,7 +40,7 @@
         {std::move(primary_config),
         std::move(external_config)}
     },
-    card{mg::DisplayConfigurationCardId{0}, 1}
+    card{mg::DisplayConfigurationCardId{0}, max_displays}
 {
     primary().power_mode = primary_mode;
     external().power_mode = external_mode;

=== modified file 'tests/unit-tests/graphics/android/test_display.cpp'
--- tests/unit-tests/graphics/android/test_display.cpp	2015-04-09 06:20:31 +0000
+++ tests/unit-tests/graphics/android/test_display.cpp	2015-04-20 17:02:35 +0000
@@ -803,3 +803,23 @@
 
     vsync_fn(mga::DisplayName::primary);
 }
+
+TEST_F(Display, reports_correct_card_information)
+{
+    using namespace testing;
+    mga::Display display(
+        stub_db_factory,
+        stub_gl_program_factory,
+        stub_gl_config,
+        null_display_report,
+        mga::OverlayOptimization::enabled);
+
+    int num_cards = 0;
+    display.configuration()->for_each_card(
+        [&](mg::DisplayConfigurationCard const& config)
+        {
+            EXPECT_THAT(config.max_simultaneous_outputs, Eq(2));
+            num_cards++;
+        });
+    EXPECT_THAT(num_cards, Eq(1));
+}