Merge lp:~unity-team/platform-api/exposeOrientation-fix-android into lp:platform-api

[Gerry Boland]

For for exposeOrientation breaking hybris side

For for exposeOrientation breaking hybris side

[Gerry Boland (gerboland)]

This will probably do it, but for some reason I'm unable to build the android bits right now. Can someone else please try?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/platform-api-ci/372/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-utopic-i386-ci/105

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/372/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Looks good, fixes the build.

review: Approve

[Kevin DuBois (kdub)]

Was able to build with sbuild for armhf and released mir

review: Approve

=== modified file 'android/default/default_ubuntu_application_ui.cpp'
--- android/default/default_ubuntu_application_ui.cpp	2014-08-20 17:13:47 +0000
+++ android/default/default_ubuntu_application_ui.cpp	2014-09-26 16:03:15 +0000
@@ -449,8 +449,8 @@
     UAUiWindow *window)
 {
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-    return p->value->get_orientation();
+    (void*) window;
+    // Orientation flag not available with android, return default
+    return U_ORIENTATION_NORMAL;
 }