Merge lp:~mir-team/platform-api/delete-deprecations into lp:platform-api

[Robert Carr]

Delete deprecated mir functions.

Why now? https://code.launchpad.net/~mir-team/mir/privatize-event/+merge/254149

The old mir-event is being made private and the new event does not have many fields corresponding to legacy in the UbuntuEvent (i.e. "is_system_key"). Thus it seems like rather than update unused code (qtubuntu is already ported) to build but be broken its a good time to delete it all.

Update major version to 3.

Delete deprecated mir functions.

Why now? https://code.launchpad.net/~mir-team/mir/privatize-event/+merge/254149

The old mir-event is being made private and the new event does not have many fields corresponding to legacy in the UbuntuEvent (i.e. "is_system_key"). Thus it seems like rather than update unused code (qtubuntu is already ported) to build but be broken its a good time to delete it all.

Update major version to 3.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/platform-api-ci/417/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/30/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Lots'o red, yum. Need ricmm or something with deeper knowledge of these APIs to comment. My 2 cents:

=== modified file 'debian/changelog'
+platform-api (3.0.0+15.04.20150320-0ubuntu1) UNRELEASED; urgency=medium
no need to fill in the "+15.04..." in the package version string, the CI train does that for us.

=== modified file 'debian/control'
Do we plan to keep the old 2.* series around, or can we just have the 2.x series completely replaced? The package migration path will require care.

- test_android_ubuntu_app_api
- test_android_ubuntu_app_api_multiple_surfaces
These look useful for device bring-up, can they not be ported to use mirclient?

review: Needs Fixing

[Robert Carr (robertcarr)]

>>=== modified file 'debian/changelog'
>> +platform-api (3.0.0+15.04.20150320-0ubuntu1) UNRELEASED; urgency=medium
>> no need to fill in the "+15.04..." in the package version string, the CI train does that
>> for us.

Fixed

>> === modified file 'debian/control'
>> Do we plan to keep the old 2.* series around, or can we just have the 2.x series
>> completely replaced? The package migration path will require care.

I think I've updated things to replace the old 2.* series. I guess we need input from someone else.

>> - test_android_ubuntu_app_api
>> - test_android_ubuntu_app_api_multiple_surfaces
>> These look useful for device bring-up, can they not be ported to use mirclient?

mir already has so many examples though...

[Ricardo Salveti (rsalveti)]

Please also build the android image with these platform-api changes, so we know it doesn't break anything before pushing it.

[Robert Carr (robertcarr)]

What is the android image and how do I build it? I've never actually understood that. What would have been wrong with building this as part of a Mir release silo?

[Ricardo Salveti (rsalveti)]

On Tue, May 26, 2015 at 2:58 PM, Robert Carr <email address hidden> wrote:
> What is the android image and how do I build it? I've never actually understood that. What would have been wrong with building this as part of a Mir release silo?

One easy way is following
https://wiki.ubuntu.com/Touch/Emulator#Building_from_scratch

Nothing wrong about building this as part of the Mir release silo, my
question is what happened that it wasn't.

[Robert Carr (robertcarr)]

Talked a bit on IRC :) I'll test building an image soon.

[Robert Carr (robertcarr)]

Had to make some more changes to get android build working (more deletions) but all is good now! tested emulator build and image runs.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/platform-api-ci/418/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/31/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

FTBFS in my wily chroot:

[ 5%] Building CXX object src/ubuntu/application/CMakeFiles/ubuntu_application_api.dir/ubuntu_application_api.cpp.o
cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/src/ubuntu/application && /usr/lib/ccache/x86_64-linux-gnu-g++-4.9 -Dubuntu_application_api_EXPORTS -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -fvisibility=hidden --std=c++11 -fPIC -fPIC -I/«PKGBUILDDIR»/include -I/«PKGBUILDDIR»/android/include -I/usr/include/mirclient -I/usr/include/mircommon -I/«PKGBUILDDIR»/src -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/include -I/«PKGBUILDDIR»/src/ubuntu/application/../../bridge -o CMakeFiles/ubuntu_application_api.dir/ubuntu_application_api.cpp.o -c /«PKGBUILDDIR»/src/ubuntu/application
/ubuntu_application_api.cpp
/«PKGBUILDDIR»/src/ubuntu/application/ubuntu_application_api.cpp:22:42: fatal error: ubuntu/application/ui/window.h: No such file or directory
 #include <ubuntu/application/ui/window.h>
                                          ^
compilation terminated.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/platform-api-ci/419/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/32/console

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

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

I see! It turns out platform api will build using system installed headers and so I was able to build some code locally that wont work in sbuild...so there was even more code to delete! I've deleted it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:311
http://jenkins.qa.ubuntu.com/job/platform-api-ci/420/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/33

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

I can confirm it builds in vivid+overlay & wily. So yay for that. Who will land it?

review: Approve (build)

[Alberto Aguirre (albaguirre)]

Version should be updated in src/ubuntu/application/desktop/module_version.h as well right?

review: Needs Information

[Robert Carr (robertcarr)]

Good catch! fixed all three module_version.h are correct now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/platform-api-ci/422/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/35

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

Looks ok, haven't tested.

I should probably rebase this: https://code.launchpad.net/~mir-team/platform-api/remove-mirserver on top of this one given the major revision bump and land them together.

review: Approve

[Alberto Aguirre (albaguirre)]

Looking at the rdpends, looks like this is the list to rebuild (hopefully no-change rebuilds) when attempting to land this:

qtubuntu-android
qtubuntu-desktop
powerd
libubuntu-location-service2
qtubuntu-sensors
cameraplugin-aal

Any other packages missing from that list?

[Gerry Boland (gerboland)]

based on https://code.launchpad.net/~vorlon/platform-api/lp.1465958/+merge/262254 , you might need to add gst-plugins-bad1.0 to that list

[Iain Lane (laney)]

Any chance we can try to get this uploaded?

[Ricardo Mendoza (ricmm)]

Some indicators consume this as well, please make sure that the rdepends list is well walked before landing this.

Robert, I take your word for it fully building correctly on Android.

I've done a quick code review and it seems sane, I'll approve from my end but bear in mind I can't do a full tested-across-the-board review right now.

review: Approve

[Alberto Aguirre (albaguirre)]

> Some indicators consume this as well, please make sure that the rdepends list
> is well walked before landing this.

I could only find indicator-datetime, which has since removed the platform-api dependency as of version: 13.10.0+14.10.20140819-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:313
http://jenkins.qa.ubuntu.com/job/platform-api-ci/426/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/39/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/39/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/39/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:314
http://jenkins.qa.ubuntu.com/job/platform-api-ci/427/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/40

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:315
http://jenkins.qa.ubuntu.com/job/platform-api-ci/428/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/41

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-18 10:03:52 +0000
+++ CMakeLists.txt	2015-07-06 16:10:44 +0000
@@ -2,8 +2,8 @@
 
 project(ubuntu-platform-api)
 
-set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
-set(UBUNTU_PLATFORM_API_VERSION_MINOR 9)
+set(UBUNTU_PLATFORM_API_VERSION_MAJOR 3)
+set(UBUNTU_PLATFORM_API_VERSION_MINOR 0)
 set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

=== removed file 'android/default/default_ubuntu_application.cpp'
--- android/default/default_ubuntu_application.cpp	2013-05-30 01:08:53 +0000
+++ android/default/default_ubuntu_application.cpp	1970-01-01 00:00:00 +0000
@@ -1,409 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- *              Ricardo Mendoza <[e-mail]>
- */
-
-// Private
-#include <private/application/ui/init.h>
-#include <private/application/ui/setup.h>
-#include <private/application/ui/ubuntu_application_ui.h>
-
-// Public C apis
-#include <ubuntu/application/id.h>
-#include <ubuntu/application/instance.h>
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/ui/options.h>
-
-// ver2.0 Private
-
-#include <private/ui/session_service.h>
-#include <private/application/application.h>
-
-#include <utils/Log.h>
-
-// C APIs
-namespace
-{
-struct IUApplicationLifecycleDelegate : public ubuntu::application::LifecycleDelegate
-{
-    IUApplicationLifecycleDelegate(void *context) :
-                                    application_resumed_cb(NULL),
-                                    application_about_to_stop_cb(NULL),
-                                    context(context),
-                                    refcount(1)
-    {
-    }
-
-    void on_application_resumed()
-    {
-        ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-        if (!application_resumed_cb)
-            return;
-    
-        application_resumed_cb(NULL, this->context);
-    }
-
-    void on_application_about_to_stop()
-    {
-        ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-        if (!application_about_to_stop_cb)
-            return;
-
-        application_about_to_stop_cb(NULL, this->context);
-    }
-
-    u_on_application_resumed application_resumed_cb;
-    u_on_application_about_to_stop application_about_to_stop_cb;
-    void *context;
-
-    unsigned refcount;
-};
-
-template<typename T>
-struct Holder
-{
-    Holder(const T&value = T()) : value(value)
-    {
-    }
-
-    T value;
-};
-
-template<typename T>
-Holder<T>* make_holder(const T& value)
-{
-    return new Holder<T>(value);
-}
-}
-
-/*
- * Application Lifecycle 
- */
-
-UApplicationLifecycleDelegate*
-u_application_lifecycle_delegate_new()
-{
-    ALOGI("%s()", __PRETTY_FUNCTION__);
-
-    ubuntu::application::LifecycleDelegate::Ptr p(new IUApplicationLifecycleDelegate(NULL));
-
-    return make_holder(p);
-}
-
-void
-u_application_lifecycle_delegate_destroy(UApplicationLifecycleDelegate *delegate)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-
-    if (s->value->refcount)
-        return;
-
-    delete s;
-}
-
-void
-u_application_lifecycle_delegate_ref(UApplicationLifecycleDelegate *delegate)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-    s->value->refcount++;
-}
-
-void
-u_application_lifecycle_delegate_unref(UApplicationLifecycleDelegate *delegate)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-    if (s->value->refcount)
-        s->value->refcount--;
-}
-
-void
-u_application_lifecycle_delegate_set_application_resumed_cb(
-    UApplicationLifecycleDelegate *delegate,
-    u_on_application_resumed cb)
-{ 
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-    s->value->application_resumed_cb = cb;
-}
-
-u_on_application_resumed
-u_application_lifecycle_delegate_get_application_resumed_cb(
-    UApplicationLifecycleDelegate *delegate)
-{ 
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-    return s->value->application_resumed_cb;
-}
-
-void
-u_application_lifecycle_delegate_set_application_about_to_stop_cb(
-    UApplicationLifecycleDelegate *delegate,
-    u_on_application_about_to_stop cb)
-{ 
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-    s->value->application_about_to_stop_cb = cb;
-}
-
-u_on_application_about_to_stop
-u_application_lifecycle_delegate_get_application_about_to_stop_cb(
-    UApplicationLifecycleDelegate *delegate)
-{ 
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-    return s->value->application_about_to_stop_cb;
-}
-
-void
-u_application_lifecycle_delegate_set_context(
-    UApplicationLifecycleDelegate *delegate,
-    void *context)
-{
-    ALOGI("%s():%d context=%p", __PRETTY_FUNCTION__, __LINE__, context);
-    
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-    if (s->value->context == NULL)
-        s->value->context = context;
-}
-
-void*
-u_application_lifecycle_delegate_get_context(
-    UApplicationLifecycleDelegate *delegate,
-    void *context)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    auto s = static_cast<Holder<IUApplicationLifecycleDelegate*>*>(delegate);
-    return s->value->context;
-}
-
-/*
- * Application Options
- */
-
-UApplicationOptions*
-u_application_options_new_from_cmd_line(
-    int argc,
-    char** argv)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    ubuntu::application::ui::init(argc, argv);
-
-    return ubuntu::application::ui::Setup::instance().get();
-}
-
-UAUiFormFactor
-u_application_options_get_form_factor(
-    UApplicationOptions *options)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    auto setup = static_cast<ubuntu::application::ui::Setup*>(options);
-    return static_cast<UAUiFormFactor>(setup->form_factor_hint());
-}
-
-UAUiStage
-u_application_options_get_stage(
-    UApplicationOptions *options)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    auto setup = static_cast<ubuntu::application::ui::Setup*>(options);
-    return static_cast<UAUiStage>(setup->stage_hint());
-}
-
-/*
- * Application Id
- */
-
-UApplicationId*
-u_application_id_new_from_stringn(
-    const char *string,
-    size_t size)
-{
-    ubuntu::application::Id::Ptr id(
-        new ubuntu::application::Id(string, size)
-        );
-
-    return make_holder(id);
-}
-
-void
-u_application_id_destroy(UApplicationId *id)
-{
-    
-    auto p = static_cast<Holder<ubuntu::application::Id::Ptr>*>(id);
-
-    if (p)
-        delete p;
-}
-
-int
-u_application_id_compare(
-    UApplicationId *lhs,
-    UApplicationId *rhs)
-{    
-    auto ilhs = static_cast<Holder<ubuntu::application::Id::Ptr>*>(lhs);
-    auto irhs = static_cast<Holder<ubuntu::application::Id::Ptr>*>(rhs);
-    
-    if (ilhs->value->size != irhs->value->size)
-        return 1;
-
-    for (size_t i = 0; i < ilhs->value->size; i++)
-    {
-        if ((char) ilhs->value->string[i] == (char) irhs->value->string[i])
-            continue;
-
-        return 1;           
-    }
-
-    return 0;
-}
-
-/*
- * Description
- */
-
-UApplicationDescription*
-u_application_description_new()
-{
-    ubuntu::application::Description::Ptr desc(
-        new ubuntu::application::Description()
-        );
-
-    return make_holder(desc);
-}
-
-void
-u_application_description_destroy(
-    UApplicationDescription *desc)
-{
-    auto p = static_cast<Holder<ubuntu::application::Description::Ptr>*>(desc);
-
-    if (p)
-        delete p;
-}
-
-void
-u_application_description_set_application_id(
-    UApplicationDescription *desc,
-    UApplicationId *id)
-{
-    if (id == NULL)
-        return;
-
-    auto p = static_cast<Holder<ubuntu::application::Description::Ptr>*>(desc);
-    p->value->set_application_id(id);
-}
-
-UApplicationId*
-u_application_description_get_application_id(
-    UApplicationDescription *desc)
-{
-    auto p = static_cast<Holder<ubuntu::application::Description::Ptr>*>(desc);
-    return p->value->get_application_id();
-}
-
-void
-u_application_description_set_application_lifecycle_delegate(
-    UApplicationDescription *desc,
-    UApplicationLifecycleDelegate *delegate)
-{
-    if (delegate == NULL)
-        return;
-    
-    ALOGI("%s():%d -- delegate=%p", __PRETTY_FUNCTION__, __LINE__, delegate);
-
-    auto p = static_cast<Holder<ubuntu::application::Description::Ptr>*>(desc);
-    p->value->set_lifecycle_delegate(delegate);
-}
-
-UApplicationLifecycleDelegate*
-u_application_description_get_application_lifecycle_delegate(
-    UApplicationDescription *desc)
-{
-    auto p = static_cast<Holder<ubuntu::application::Description::Ptr>*>(desc);
-    return p->value->get_lifecycle_delegate();
-}
-
-/*
- * Instance
- */
-
-UApplicationInstance*
-u_application_instance_new_from_description_with_options(
-    UApplicationDescription *desc,
-    UApplicationOptions *options)
-{
-    if (desc == NULL || options == NULL)
-        return NULL;
-
-    ubuntu::application::Instance::Ptr instance(
-        new ubuntu::application::Instance(desc, options)
-        );
-
-    return make_holder(instance);
-}
-
-void
-u_application_instance_ref(
-    UApplicationInstance *instance)
-{
-    auto p = static_cast<Holder<ubuntu::application::Instance::Ptr>*>(instance);
-    p->value->ref();
-}
-
-void
-u_application_instance_unref(
-    UApplicationInstance *instance)
-{
-    auto p = static_cast<Holder<ubuntu::application::Instance::Ptr>*>(instance);
-    p->value->unref();
-}
-
-void
-u_application_instance_destroy(
-    UApplicationInstance *instance)
-{
-    auto p = static_cast<Holder<ubuntu::application::Instance::Ptr>*>(instance);
-
-    if (p->value->get_refcount() == 0)
-        delete p;
-}
-
-void
-u_application_instance_run(
-    UApplicationInstance *instance)
-{
-    auto p = static_cast<Holder<ubuntu::application::Instance::Ptr>*>(instance);
-
-    if (p)
-        p->value->run();
-}

=== removed file 'android/default/default_ubuntu_application_ui.cpp'
--- android/default/default_ubuntu_application_ui.cpp	2014-09-29 19:56:49 +0000
+++ android/default/default_ubuntu_application_ui.cpp	1970-01-01 00:00:00 +0000
@@ -1,465 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- *              Ricardo Mendoza <[e-mail]>
- */
-
-// Private
-#include <private/application/ui/init.h>
-#include <private/application/ui/session.h>
-#include <private/application/ui/session_credentials.h>
-#include <private/application/ui/setup.h>
-#include <private/application/ui/surface.h>
-#include <private/application/ui/surface_factory.h>
-#include <private/application/ui/surface_properties.h>
-
-// Public C apis
-#include <private/application/ui/ubuntu_application_ui.h>
-#include <ubuntu/application/instance.h>
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/window.h>
-#include <ubuntu/application/ui/clipboard.h>
-#include <ubuntu/application/ui/display.h>
-
-// ver2.0 Private
-#include <private/application/ui/window_internal.h>
-
-#include <private/ui/session_service.h>
-#include <private/application/ui/ubuntu_application_ui.h>
-#include <private/application/application.h>
-
-#include <utils/Log.h>
-
-namespace
-{
-ubuntu::application::ui::Session::Ptr session;
-
-struct CallbackEventListener : public ubuntu::application::ui::input::Listener
-{
-    CallbackEventListener(input_event_cb cb, void* context) : cb(cb),
-        context(context)
-    {
-    }
-
-    void on_new_event(const ::Event& e)
-    {
-        if (cb)
-            cb(context, &e);
-    }
-
-    input_event_cb cb;
-    void* context;
-};
-
-template<typename T>
-struct Holder
-{
-    Holder(const T&value = T()) : value(value)
-    {
-    }
-
-    T value;
-};
-
-template<typename T>
-Holder<T>* make_holder(const T& value)
-{
-    return new Holder<T>(value);
-}
-}
-
-/*
- * Clipboard
- */
-
-void
-ua_ui_set_clipboard_content(void* data,
-                                            size_t size)
-{
-    static const char mime_type[ubuntu::application::ui::Clipboard::Content::MAX_MIME_TYPE_SIZE] = "none/none";
-
-    ubuntu::application::ui::Clipboard::Content content(mime_type, data, size);
-
-    ubuntu::application::ui::Session::clipboard()->set_content(content);
-}
-
-void
-ua_ui_get_clipboard_content(void** data,
-                                            size_t* size)
-{
-    ubuntu::application::ui::Clipboard::Content content(ubuntu::application::ui::Session::clipboard()->get_content());
-
-    *data = content.data;
-    *size = content.data_size;
-}
-
-/*
- * Display
- */
-
-UAUiDisplay*
-ua_ui_display_new_with_index(
-    size_t index)
-{
-    return make_holder(
-        ubuntu::application::ui::Session::physical_display_info(
-            static_cast<ubuntu::application::ui::PhysicalDisplayIdentifier>(index)));
-}
-
-void
-ua_ui_display_destroy(
-    UAUiDisplay* display)
-{
-    auto s = static_cast<Holder<ubuntu::application::ui::PhysicalDisplayInfo::Ptr>*>(display);
-    delete s;
-}
-
-uint32_t
-ua_ui_display_query_horizontal_res(
-    UAUiDisplay* display)
-{
-    auto s = static_cast<Holder<ubuntu::application::ui::PhysicalDisplayInfo::Ptr>*>(display);
-    return s->value->horizontal_resolution();
-}
-
-uint32_t
-ua_ui_display_query_vertical_res(
-    UAUiDisplay* display)
-{
-    auto s = static_cast<Holder<ubuntu::application::ui::PhysicalDisplayInfo::Ptr>*>(display);
-    return s->value->vertical_resolution();
-}
-
-EGLNativeDisplayType
-ua_ui_display_get_native_type(
-    UAUiDisplay* display)
-{
-    // Always EGL_DEFAULT_DISPLAY with android EGL.
-    return EGL_DEFAULT_DISPLAY;
-}                              
-
-/*
- * Window Properties
- */
-
-UAUiWindowProperties*
-ua_ui_window_properties_new_for_normal_window()
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    
-    ubuntu::application::ui::WindowProperties::Ptr p(
-        new ubuntu::application::ui::WindowProperties()
-        );
-
-    return make_holder(p);
-}
-
-void
-ua_ui_window_properties_destroy(
-    UAUiWindowProperties *properties)
-{
-    auto p = static_cast<Holder<ubuntu::application::ui::WindowProperties::Ptr>*>(properties);
-    
-    if (p)
-        delete p;
-}
-
-void
-ua_ui_window_properties_set_titlen(
-    UAUiWindowProperties *properties,
-    const char *title,
-    size_t size)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    auto p = static_cast<Holder<ubuntu::application::ui::WindowProperties::Ptr>*>(properties);
-    p->value->set_titlen(title, size);
-}
-
-const char*
-ua_ui_window_properties_get_title(
-    UAUiWindowProperties *properties)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    auto p = static_cast<Holder<ubuntu::application::ui::WindowProperties::Ptr>*>(properties);
-    return p->value->get_title();
-}
-
-void
-ua_ui_window_properties_set_role(
-    UAUiWindowProperties *properties,
-    UAUiWindowRole role)
-{
-    ALOGI("%s():%d %p %d", __PRETTY_FUNCTION__, __LINE__, properties, role);
-    auto p = static_cast<Holder<ubuntu::application::ui::WindowProperties::Ptr>*>(properties);
-    p->value->set_role(role);
-}
-
-UAUiWindowRole
-ua_ui_window_properties_get_role(
-    UAUiWindowProperties *properties)
-{
-    auto p = static_cast<Holder<ubuntu::application::ui::WindowProperties::Ptr>*>(properties);
-    return p->value->get_role();
-}
-
-void
-ua_ui_window_properties_set_input_cb_and_ctx(
-    UAUiWindowProperties *properties,
-    UAUiWindowInputEventCb cb,
-    void *ctx)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    auto p = static_cast<Holder<ubuntu::application::ui::WindowProperties::Ptr>*>(properties);
-    p->value->set_input_event_cb_and_ctx(cb, ctx);
-}
-
-void
-ua_ui_window_properties_set_event_cb_and_ctx(UAUiWindowProperties*, UAUiWindowEventCb, void *)
-{
-}
-
-void
-ua_ui_window_properties_set_dimensions(
-    UAUiWindowProperties *properties,
-    uint32_t width,
-    uint32_t height)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    (void) width;
-    (void) height;
-}
-
-/*
- * Session
- */
-
-UAUiSessionProperties*
-ua_ui_session_properties_new()
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    ubuntu::application::ui::SessionProperties::Ptr props(
-        new ubuntu::application::ui::SessionProperties()
-        );
-
-    return make_holder(props);
-}
-
-void
-ua_ui_session_properties_set_type(
-    UAUiSessionProperties* properties,
-    UAUiSessionType type)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    auto p = static_cast<Holder<ubuntu::application::ui::SessionProperties::Ptr>*>(properties);
-
-    if (p)
-        p->value->set_type(static_cast<ubuntu::application::ui::SessionType>(type));
-}
-
-void
-ua_ui_session_properties_set_remote_pid(
-    UAUiSessionProperties *properties,
-    uint32_t pid)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    auto p = static_cast<Holder<ubuntu::application::ui::SessionProperties::Ptr>*>(properties);
-    p->value->set_remote_pid(pid);
-}
-
-UAUiSession*
-ua_ui_session_new_with_properties(
-    UAUiSessionProperties *properties)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    if (session != NULL)
-        return session.get();
-    
-    auto p = static_cast<Holder<ubuntu::application::ui::SessionProperties::Ptr>*>(properties);
-
-    SessionCredentials creds = {
-            static_cast<SessionType>(p->value->get_type()),
-            APPLICATION_SUPPORTS_OVERLAYED_MENUBAR,
-            "QtUbuntu",
-            p->value->get_remote_pid(),
-            NULL
-    };    
-
-    ubuntu::application::ui::SessionCredentials sc(&creds);
-    session = ubuntu::ui::SessionService::instance()->start_a_new_session(sc);
-
-    return session.get();
-}
-
-/*
- * Window (Surface)
- */
-
-UAUiWindow*
-ua_ui_window_new_for_application_with_properties(
-    UApplicationInstance *instance,
-    UAUiWindowProperties *properties)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-
-    if (session == NULL)
-        return NULL;
-    
-    auto p = static_cast<Holder<ubuntu::application::ui::WindowProperties::Ptr>*>(properties);
-
-    ubuntu::application::ui::SurfaceProperties props =
-    {
-        "test",
-        0,
-        0,
-        static_cast<ubuntu::application::ui::SurfaceRole>(p->value->get_role()),
-        0, //FIXME: Set flags
-        true
-    };
-
-    ubuntu::application::ui::Surface::Ptr surface =
-        session->create_surface(
-            props,
-            ubuntu::application::ui::input::Listener::Ptr(
-                new CallbackEventListener(p->value->get_input_cb(),
-                                          p->value->get_ctx())));
-
-    auto inst = static_cast<Holder<ubuntu::application::Instance::Ptr>*>(instance);
-    auto desc = static_cast<Holder<ubuntu::application::Description::Ptr>*>(inst->value->get_description());
-    auto dele = static_cast<Holder<ubuntu::application::LifecycleDelegate::Ptr>*>(desc->value->get_lifecycle_delegate());
-
-    session->install_lifecycle_delegate(dele->value);
-
-    return make_holder(surface);
-}
-
-void
-ua_ui_window_destroy(
-    UAUiWindow *window)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    //auto p = static_cast<Holder<ubuntu::application::ui::Window::Ptr*>*>(window);
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-
-    if (p)
-        delete p;
-}
-
-UAUiWindowId
-ua_ui_window_get_id(
-    UAUiWindow *window)
-{
-    //auto p = static_cast<Holder<ubuntu::application::ui::Window::Ptr*>*>(window);
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-    
-    return p->value->get_id();
-}
-
-UStatus
-ua_ui_window_move(
-    UAUiWindow *window,
-    uint32_t new_x,
-    uint32_t new_y)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-    p->value->move_to(new_x, new_y);
-    
-    return U_STATUS_SUCCESS;
-}
-
-UStatus
-ua_ui_window_resize(
-    UAUiWindow *window,
-    uint32_t new_width,
-    uint32_t new_height)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    //auto p = static_cast<Holder<ubuntu::application::ui::Window::Ptr*>*>(window);
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-    p->value->resize(new_width, new_height);
-
-    return U_STATUS_SUCCESS;
-}
-
-UStatus
-ua_ui_window_hide(
-    UAUiWindow *window)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    //auto p = static_cast<Holder<ubuntu::application::ui::Window::Ptr*>*>(window);
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-    p->value->set_visible(session->get_session_pid(), false);
-
-    return U_STATUS_SUCCESS;
-}
-
-UStatus
-ua_ui_window_show(
-    UAUiWindow *window)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-    p->value->set_visible(session->get_session_pid(), true);
-
-    return U_STATUS_SUCCESS;
-}
-
-void
-ua_ui_window_request_fullscreen(
-    UAUiWindow *window)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    if (session == NULL)
-        return;
-
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-    session->toggle_fullscreen_for_surface(p->value);
-}
-
-void
-ua_ui_window_request_state(
-    UAUiWindow *window, UApplicationUiWindowState state)
-{
-    ALOGI("ua_ui_window_request_state unimplemented %s:%d", __PRETTY_FUNCTION__, __LINE__);
-    (void) window;
-    (void) state;
-}
-
-EGLNativeWindowType
-ua_ui_window_get_native_type(
-    UAUiWindow *window)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
-    return p->value->to_native_window_type();
-}
-
-UApplicationUiWindowOrientation
-ua_ui_window_get_orientation(
-    UAUiWindow *window)
-{
-    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
-    (void*) window;
-    // Orientation flag not available with android, return default
-    return U_ORIENTATION_NORMAL;
-}
-

=== removed file 'android/default/default_ubuntu_ui.cpp'
--- android/default/default_ubuntu_ui.cpp	2013-06-07 01:08:41 +0000
+++ android/default/default_ubuntu_ui.cpp	1970-01-01 00:00:00 +0000
@@ -1,273 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-
-#include <private/ui/session_service.h>
-#include <private/ui/session_enumerator.h>
-
-#include <stdio.h>
-
-#include <utils/Log.h>
-
-namespace
-{
-struct TaskController : public ubuntu::ui::TaskController
-{
-    TaskController(ubuntu_ui_task_controller* controller) : controller(controller)
-    {
-    }
-
-    void continue_task(int pid)
-    {
-        if (!controller)
-            return;
-
-        if (!controller->continue_task)
-            return;
-
-        controller->continue_task(pid, controller->context);
-    }
-
-    void suspend_task(int pid)
-    {
-        if (!controller)
-            return;
-
-        if (!controller->suspend_task)
-            return;
-
-        controller->suspend_task(pid, controller->context);
-    }
-
-    ubuntu_ui_task_controller* controller;
-};
-
-struct SessionLifeCycleObserver : public ubuntu::ui::SessionLifeCycleObserver
-{
-    SessionLifeCycleObserver(ubuntu_ui_session_lifecycle_observer* observer) : observer(observer)
-    {
-    }
-
-    void on_session_requested(ubuntu::ui::WellKnownApplication app)
-    {
-        if (!observer)
-            return;
-
-        if (!observer->on_session_requested)
-            return;
-
-        observer->on_session_requested(static_cast<ubuntu_ui_well_known_application>(app), observer->context);
-    }
-
-    void on_session_born(const ubuntu::ui::SessionProperties::Ptr& props)
-    {
-        if (!observer)
-            return;
-
-        if (!observer->on_session_born)
-            return;
-
-        observer->on_session_born(&props, observer->context);
-    }
-
-    void on_session_unfocused(const ubuntu::ui::SessionProperties::Ptr& props)
-    {
-        if (!observer)
-            return;
-
-        if (!observer->on_session_unfocused)
-            return;
-
-        observer->on_session_unfocused(&props, observer->context);
-    }
-
-    void on_session_focused(const ubuntu::ui::SessionProperties::Ptr& props)
-    {
-        if (!observer)
-            return;
-
-        if (!observer->on_session_focused)
-            return;
-
-        observer->on_session_focused(&props, observer->context);
-    }
-
-    void on_keyboard_geometry_changed(int x, int y, int width, int height)
-    {
-        if (!observer)
-            return;
-
-        if (!observer->on_keyboard_geometry_changed)
-            return;
-
-        observer->on_keyboard_geometry_changed(x, y, width, height, observer->context);
-    }
-
-    void on_session_requested_fullscreen(const ubuntu::ui::SessionProperties::Ptr& props)
-    {
-        if (!observer)
-            return;
-
-        if(!observer->on_session_requested_fullscreen)
-            return;
-
-        observer->on_session_requested_fullscreen(&props, observer->context);
-    }
-
-    void on_session_died(const ubuntu::ui::SessionProperties::Ptr& props)
-    {
-        if (!observer)
-            return;
-
-        if (!observer->on_session_died)
-            return;
-
-        observer->on_session_died(&props, observer->context);
-    }
-
-    ubuntu_ui_session_lifecycle_observer* observer;
-};
-
-}
-
-const char* ubuntu_ui_session_properties_get_value_for_key(ubuntu_ui_session_properties props, const char* key)
-{
-    if (!props)
-        return NULL;
-
-    if (!key)
-        return NULL;
-
-    const ubuntu::ui::SessionProperties::Ptr* p = static_cast<const ubuntu::ui::SessionProperties::Ptr*>(props);
-
-    return (*p)->value_for_key(key);
-}
-
-int ubuntu_ui_session_properties_get_application_stage_hint(ubuntu_ui_session_properties props)
-{
-    if (!props)
-        return -1;
-
-    const ubuntu::ui::SessionProperties::Ptr* p = static_cast<const ubuntu::ui::SessionProperties::Ptr*>(props);
-
-    return (*p)->application_stage_hint();
-}
-
-int ubuntu_ui_session_properties_get_application_instance_id(ubuntu_ui_session_properties props)
-{
-    if (!props)
-        return -1;
-
-    const ubuntu::ui::SessionProperties::Ptr* p = static_cast<const ubuntu::ui::SessionProperties::Ptr*>(props);
-
-    return (*p)->application_instance_id();
-}
-
-const char* ubuntu_ui_session_properties_get_desktop_file_hint(ubuntu_ui_session_properties props)
-{
-    if (!props)
-        return NULL;
-
-    const ubuntu::ui::SessionProperties::Ptr* p = static_cast<const ubuntu::ui::SessionProperties::Ptr*>(props);
-
-    return (*p)->desktop_file_hint();
-}
-
-bool ubuntu_ui_session_preview_provider_update_session_preview_texture(ubuntu_ui_session_preview_provider pp, int id, GLuint texture, unsigned int* width, unsigned int* height)
-{
-    if (!pp)
-        return false;
-
-    const ubuntu::ui::SessionPreviewProvider::Ptr* spp =
-        static_cast<const ubuntu::ui::SessionPreviewProvider::Ptr*>(pp);
-
-    return (*spp)->get_or_update_session_preview(texture, *width, *height);
-}
-
-void ubuntu_ui_session_install_session_lifecycle_observer(ubuntu_ui_session_lifecycle_observer* observer)
-{
-    ubuntu::ui::SessionLifeCycleObserver::Ptr p(new SessionLifeCycleObserver(observer));
-    ubuntu::ui::SessionService::instance()->install_session_lifecycle_observer(p);
-}
-
-void ubuntu_ui_session_unfocus_running_sessions()
-{
-    ubuntu::ui::SessionService::instance()->unfocus_running_sessions();
-}
-
-void ubuntu_ui_session_focus_running_session_with_id(int id)
-{
-    ubuntu::ui::SessionService::instance()->focus_running_session_with_id(id);
-}
-
-void ubuntu_ui_session_snapshot_running_session_with_id(int id, ubuntu_ui_session_service_snapshot_cb cb, void* context)
-{
-    ubuntu::ui::SessionSnapshot::Ptr ss = ubuntu::ui::SessionService::instance()->snapshot_running_session_with_id(id);
-
-    if (cb)
-    {
-        ALOGI("screenshot buffer (%d, %d) geometry (%d, %d, %d, %d)\n", ss->width(), ss->height(), ss->x(), ss->y(), ss->source_width(), ss->source_height());
-        cb(ss->pixel_data(), ss->width(), ss->height(), ss->x(), ss->y(),
-           ss->source_width(), ss->source_height(), ss->stride(), context);
-    }
-}
-
-void ubuntu_ui_session_trigger_switch_to_well_known_application(ubuntu_ui_well_known_application app)
-{
-    ubuntu::ui::SessionService::instance()->trigger_switch_to_well_known_application(
-        static_cast<ubuntu::ui::WellKnownApplication>(app));
-}
-
-int32_t ubuntu_ui_set_surface_trap(int32_t x, int32_t y, int32_t width, int32_t height)
-{
-    return ubuntu::ui::SessionService::instance()->set_surface_trap(x, y, width, height);
-}
-
-void ubuntu_ui_unset_surface_trap(int32_t handle)
-{
-    ubuntu::ui::SessionService::instance()->unset_surface_trap(handle);
-}
-
-void ubuntu_ui_report_osk_visible(int x, int y, int width, int height)
-{
-    ubuntu::ui::SessionService::instance()->report_osk_visible(x, y, width, height);
-}
-
-void ubuntu_ui_report_osk_invisible()
-{
-    ubuntu::ui::SessionService::instance()->report_osk_invisible();
-}
-
-void ubuntu_ui_report_notification_visible()
-{
-    ubuntu::ui::SessionService::instance()->report_notification_visible();
-}
-
-void ubuntu_ui_report_notification_invisible()
-{
-    ubuntu::ui::SessionService::instance()->report_notification_invisible();
-}
-
-void ubuntu_ui_install_task_controller(ubuntu_ui_task_controller *controller)
-{
-    printf("installing task controller");
-    ubuntu::ui::TaskController::Ptr p(new TaskController(controller));
-    ubuntu::ui::SessionService::instance()->install_task_controller(p);
-}
-

=== modified file 'android/hybris/Android.mk'
--- android/hybris/Android.mk	2015-03-19 19:56:37 +0000
+++ android/hybris/Android.mk	2015-07-06 16:10:44 +0000
@@ -22,12 +22,10 @@
 	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES := \
-	ubuntu_application_api_for_hybris.cpp \
 	ubuntu_application_gps_for_hybris.cpp \
 	ubuntu_application_sensors_for_hybris.cpp \
-	../default/default_ubuntu_application_sensor.cpp \
-	../default/default_ubuntu_ui.cpp \
-	application_manager.cpp
+	../default/default_ubuntu_application_sensor.cpp
+
 
 LOCAL_MODULE := libubuntu_application_api
 LOCAL_MODULE_TAGS := optional
@@ -55,121 +53,6 @@
 	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
-	test.cpp \
-
-LOCAL_MODULE:= direct_ubuntu_application_api_for_hybris_test
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := \
-	libandroidfw \
-	libutils \
-	libEGL \
-	libGLESv2 \
-	libubuntu_application_api
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -std=gnu++0x
-
-LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include \
-	$(UPAPI_PATH)/android/include
-
-LOCAL_SRC_FILES:= \
-	test_c_api.cpp \
-
-LOCAL_MODULE:= direct_ubuntu_application_c_api_for_hybris_test
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := \
-	libandroidfw \
-	libutils \
-	libEGL \
-	libGLESv2 \
-	libubuntu_application_api
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -std=gnu++0x
-
-LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include \
-	$(UPAPI_PATH)/android/include
-
-LOCAL_SRC_FILES:= \
-	test_session_c_api.cpp \
-
-LOCAL_MODULE:= direct_ubuntu_application_session_c_api_for_hybris_test
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := \
-	libandroidfw \
-	libutils \
-	libEGL \
-	libGLESv2 \
-	libubuntu_application_api
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -std=gnu++0x
-
-LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include \
-	$(UPAPI_PATH)/android/include
-
-LOCAL_SRC_FILES:= \
-	test_trap.cpp \
-
-LOCAL_MODULE:= direct_set_trap
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := \
-	libandroidfw \
-	libutils \
-	libEGL \
-	libGLESv2 \
-	libubuntu_application_api
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -std=gnu++0x
-
-LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include \
-	$(UPAPI_PATH)/android/include
-
-LOCAL_SRC_FILES:= \
-	test_osk_visibility.cpp \
-
-LOCAL_MODULE:= direct_osk_visibility
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := \
-	libandroidfw \
-	libutils \
-	libEGL \
-	libGLESv2 \
-	libubuntu_application_api
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -std=gnu++0x
-
-LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include \
-	$(UPAPI_PATH)/android/include
-
-LOCAL_SRC_FILES:= \
 	test_sensors_c_api.cpp \
 
 LOCAL_MODULE:= direct_ubuntu_application_sensors_c_api_for_hybris_test
@@ -209,71 +92,6 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS += \
-	-DANDROID_VERSION_MAJOR=$(ANDROID_VERSION_MAJOR) \
-	-DANDROID_VERSION_MINOR=$(ANDROID_VERSION_MINOR) \
-	-DANDROID_VERSION_PATCH=$(ANDROID_VERSION_PATCH)
-
-LOCAL_CFLAGS += -std=gnu++0x
-
-LOCAL_C_INCLUDES := \
-	external/skia/include/core \
-	frameworks/base/services \
-	$(UPAPI_PATH)/include \
-	$(UPAPI_PATH)/android/include
-
-LOCAL_SRC_FILES:= \
-	application_manager.cpp \
-	default_application_manager.cpp \
-
-LOCAL_MODULE:= ubuntuappmanager
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := \
-	libbinder \
-	libinput \
-	liblog \
-	libgui \
-	libskia \
-	libandroidfw \
-	libutils \
-	libEGL \
-	libGLESv2 \
-	libubuntu_application_api
-
-ifeq ($(HAS_LIBINPUTSERVICE),true)
-LOCAL_SHARED_LIBRARIES += libinputservice
-endif
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -std=gnu++0x
-
-LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include \
-	$(UPAPI_PATH)/android/include
-
-LOCAL_SRC_FILES:= \
-	application_manager.cpp \
-	default_application_manager_test.cpp \
-
-LOCAL_MODULE:= ubuntuappmanager_test
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := \
-	libbinder \
-	libandroidfw \
-	libutils \
-	libEGL \
-	libGLESv2 \
-	libubuntu_application_api
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \

=== removed file 'android/hybris/application_manager.cpp'
--- android/hybris/application_manager.cpp	2013-06-07 01:08:41 +0000
+++ android/hybris/application_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,900 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#include "application_manager.h"
-
-#include <binder/Parcel.h>
-#include <utils/String8.h>
-
-namespace android
-{
-IMPLEMENT_META_INTERFACE(ClipboardService, "UbuntuClipboardService");
-IMPLEMENT_META_INTERFACE(AMTaskController, "UbuntuApplicationManagerTaskController");
-IMPLEMENT_META_INTERFACE(ApplicationManagerObserver, "UbuntuApplicationManagerObserver");
-IMPLEMENT_META_INTERFACE(ApplicationManagerSession, "UbuntuApplicationManagerSession");
-IMPLEMENT_META_INTERFACE(ApplicationManager, "UbuntuApplicationManager");
-
-IClipboardService::Content::Content() : data(NULL),
-                                        data_size(0)
-{
-}
-
-IClipboardService::Content::Content(
-    const String8& mime_type, 
-    void* _data, 
-    size_t size) : mime_type(mime_type),
-                        data(malloc(size)),
-                        data_size(size)
-{
-    memcpy(this->data, _data, size);
-}
-
-IClipboardService::Content::~Content()
-{
-    if (data != NULL && data_size != 0)
-        free(data);
-}
-
-IClipboardService::Content::Content(const IClipboardService::Content& content) 
-        : mime_type(content.mime_type),
-          data(malloc(content.data_size)),          
-          data_size(content.data_size)
-{
-    memcpy(data, content.data, data_size);
-}
-
-IClipboardService::Content& IClipboardService::Content::operator=(const IClipboardService::Content& content) 
-{
-    mime_type = content.mime_type;
-    data_size = content.data_size;
-    data = realloc(data, data_size);
-    memcpy(data, content.data, data_size);
-
-    return *this;
-}
-
-status_t BnClipboardService::onTransact(uint32_t code,
-                                        const Parcel& data,
-                                        Parcel* reply,
-                                        uint32_t flags)
-{
-    switch(code)
-    {
-        case SET_CLIPBOARD_CONTENT_COMMAND:
-            {
-                IClipboardService::Content content;
-                String8 mime_type = data.readString8();
-                size_t data_size = data.readInt32();
-                void* p = malloc(data_size);
-                data.read(p, data_size);
-                set_content(Content(mime_type, p, data_size));
-                free(p);
-                break;
-            }
-        case GET_CLIPBOARD_CONTENT_COMMAND:
-            {
-                IClipboardService::Content content;
-                get_content(content);
-
-                reply->writeString8(String8(content.mime_type));
-                reply->writeInt32(content.data_size);
-                reply->write(content.data, content.data_size);
-            }
-            break;
-    }
-
-    return NO_ERROR;
-}
-
-BpClipboardService::BpClipboardService(const sp<IBinder>& impl) : BpInterface<IClipboardService>(impl)
-{
-}
-
-void BpClipboardService::set_content(const IClipboardService::Content& content)
-{
-    Parcel in, out;
-
-    in.writeString8(String8(content.mime_type));
-    in.writeInt32(content.data_size);
-    in.write(content.data, content.data_size);
-    
-    remote()->transact(
-        SET_CLIPBOARD_CONTENT_COMMAND,
-        in,
-        &out);
-}
-
-void BpClipboardService::get_content(IClipboardService::Content& content)
-{
-    Parcel in, out;
-
-    remote()->transact(
-        GET_CLIPBOARD_CONTENT_COMMAND,
-        in,
-        &out);
-
-    content.mime_type = out.readString8();
-    content.data_size = out.readInt32();
-    content.data = malloc(content.data_size);
-    out.read(content.data, content.data_size);
-}
-
-BnApplicationManagerSession::BnApplicationManagerSession()
-{
-}
-
-BnApplicationManagerSession::~BnApplicationManagerSession() {}
-
-status_t BnApplicationManagerSession::onTransact(uint32_t code,
-        const Parcel& data,
-        Parcel* reply,
-        uint32_t flags)
-{
-    switch(code)
-    {
-    case RAISE_APPLICATION_SURFACES_TO_LAYER_COMMAND:
-    {
-        int32_t layer;
-        data.readInt32(&layer);
-
-        raise_application_surfaces_to_layer(layer);
-    }
-    break;
-    case RAISE_SURFACE_TO_LAYER_COMMAND:
-    {
-        int32_t token, layer;
-        token = data.readInt32();
-        layer = data.readInt32();
-        
-        raise_surface_to_layer(token, layer);
-    }
-    break;
-    case QUERY_SURFACE_PROPERTIES_FOR_TOKEN_COMMAND:
-    {
-        int32_t token = data.readInt32();
-        IApplicationManagerSession::SurfaceProperties props =
-            query_surface_properties_for_token(token);
-        reply->writeInt32(props.layer);
-        reply->writeInt32(props.left);
-        reply->writeInt32(props.top);
-        reply->writeInt32(props.right);
-        reply->writeInt32(props.bottom);
-    }
-    break;
-    case ON_APPLICATION_STARTED_NOTIFICATION:
-    {
-        on_application_resumed();
-    }
-    break;
-    case ON_APPLICATION_ABOUT_TO_STOP_NOTIFICATION:
-    {
-        on_application_about_to_stop();
-    }
-    break;
-    }
-    return NO_ERROR;
-}
-
-BpApplicationManagerSession::BpApplicationManagerSession(const sp<IBinder>& impl)
-    : BpInterface<IApplicationManagerSession>(impl)
-{
-}
-
-BpApplicationManagerSession::~BpApplicationManagerSession()
-{
-}
-
-void BpApplicationManagerSession::raise_surface_to_layer(int32_t token, int layer)
-{
-    Parcel in, out;
-
-    in.writeInt32(token);
-    in.writeInt32(layer);
-    
-    remote()->transact(
-        RAISE_SURFACE_TO_LAYER_COMMAND,
-        in,
-        &out);
-}
-
-void BpApplicationManagerSession::raise_application_surfaces_to_layer(int layer)
-{
-    Parcel in, out;
-    in.writeInt32(layer);
-
-    remote()->transact(
-        RAISE_APPLICATION_SURFACES_TO_LAYER_COMMAND,
-        in,
-        &out);
-}
-
-IApplicationManagerSession::SurfaceProperties BpApplicationManagerSession::query_surface_properties_for_token(int32_t token)
-{
-    Parcel in, out;
-    in.writeInt32(token);
-
-    remote()->transact(
-        QUERY_SURFACE_PROPERTIES_FOR_TOKEN_COMMAND,
-        in,
-        &out);
-
-    IApplicationManagerSession::SurfaceProperties props;
-    props.layer = out.readInt32();
-    props.left = out.readInt32();
-    props.top = out.readInt32();
-    props.right = out.readInt32();
-    props.bottom = out.readInt32();
-
-    return props;
-}
-
-void BpApplicationManagerSession::on_application_resumed()
-{
-    Parcel in, out;
-
-    remote()->transact(
-        ON_APPLICATION_STARTED_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-void BpApplicationManagerSession::on_application_about_to_stop()
-{
-    Parcel in, out;
-
-    remote()->transact(
-        ON_APPLICATION_ABOUT_TO_STOP_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-status_t BnAMTaskController::onTransact(uint32_t code,
-        const Parcel& data,
-        Parcel* reply,
-        uint32_t flags)
-{
-    switch(code)
-    {
-    case CONTINUE_TASK_COMMAND:
-        {
-            uint32_t pid = data.readInt32();
-            continue_task(pid);
-            break;
-        }
-    case SUSPEND_TASK_COMMAND:
-        {
-            int pid = data.readInt32();
-            suspend_task(pid);
-            break;
-        }
-    }
-
-    return NO_ERROR;
-}
-
-BpAMTaskController::BpAMTaskController(const sp<IBinder>& impl)
-    : BpInterface<IAMTaskController>(impl)
-{
-}
-
-void BpAMTaskController::continue_task(uint32_t pid)
-{
-    Parcel in, out;
-    in.writeInt32(pid);
-
-    remote()->transact(
-        CONTINUE_TASK_COMMAND,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-void BpAMTaskController::suspend_task(uint32_t pid)
-{
-    Parcel in, out;
-    in.writeInt32(pid);
-
-    remote()->transact(
-        SUSPEND_TASK_COMMAND,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-status_t BnApplicationManagerObserver::onTransact(uint32_t code,
-        const Parcel& data,
-        Parcel* reply,
-        uint32_t flags)
-{
-    
-
-    switch(code)
-    {
-    case ON_SESSION_REQUESTED_NOTIFICATION:
-        {
-            uint32_t app = data.readInt32();
-            on_session_requested(app);
-            break;
-        }
-    case ON_SESSION_BORN_NOTIFICATION:
-        {
-            int id = data.readInt32();
-            int stage_hint = data.readInt32();
-            String8 desktop_file = data.readString8();
-            on_session_born(id, stage_hint, desktop_file);
-            break;
-        }
-    case ON_SESSION_UNFOCUSED_NOTIFICATION:
-        {
-            int id = data.readInt32();
-            int stage_hint = data.readInt32();
-            String8 desktop_file = data.readString8();
-            on_session_unfocused(id, stage_hint, desktop_file);
-            break;
-        }
-    case ON_SESSION_FOCUSED_NOTIFICATION:
-        {
-            int id = data.readInt32();
-            int stage_hint = data.readInt32();
-            String8 desktop_file = data.readString8();
-            on_session_focused(id, stage_hint, desktop_file);
-            break;
-        }
-    case ON_KEYBOARD_GEOMETRY_CHANGED_NOTIFICATION:
-        {
-            int x = data.readInt32();
-            int y = data.readInt32();
-            int width = data.readInt32();
-            int height = data.readInt32();
-            on_keyboard_geometry_changed(x, y, width, height);
-            break;
-        }
-    case ON_SESSION_REQUESTED_FULLSCREEN_NOTIFICATION:
-        {
-            int id = data.readInt32();
-            int stage_hint = data.readInt32();
-            String8 desktop_file = data.readString8();
-            on_session_requested_fullscreen(id, stage_hint, desktop_file);
-            break;
-        }
-    case ON_SESSION_DIED_NOTIFICATION:
-        {
-            int id = data.readInt32();
-            int stage_hint = data.readInt32();
-            String8 desktop_file = data.readString8();
-            on_session_died(id, stage_hint, desktop_file);
-            break;
-        }
-    }
-
-    return NO_ERROR;
-}
-
-BpApplicationManagerObserver::BpApplicationManagerObserver(const sp<IBinder>& impl)
-    : BpInterface<IApplicationManagerObserver>(impl)
-{
-}
-
-void BpApplicationManagerObserver::on_session_requested(
-    uint32_t app)
-{
-    Parcel in, out;
-    in.writeInt32(app);
-
-    remote()->transact(
-        ON_SESSION_REQUESTED_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-void BpApplicationManagerObserver::on_session_born(int id,
-                                                   int stage_hint,
-                                                   const String8& desktop_file_hint)
-{
-    Parcel in, out;
-    in.writeInt32(id);
-    in.writeInt32(stage_hint);
-    in.writeString8(desktop_file_hint);
-
-    remote()->transact(
-        ON_SESSION_BORN_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-void BpApplicationManagerObserver::on_session_unfocused(int id,
-                                                        int stage_hint,
-                                                        const String8& desktop_file_hint)
-{
-    Parcel in, out;
-    in.writeInt32(id);
-    in.writeInt32(stage_hint);
-    in.writeString8(desktop_file_hint);
-
-    remote()->transact(
-        ON_SESSION_UNFOCUSED_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-void BpApplicationManagerObserver::on_session_focused(int id,
-                                                      int stage_hint,
-                                                      const String8& desktop_file_hint)
-{
-    Parcel in, out;
-    in.writeInt32(id);
-    in.writeInt32(stage_hint);
-    in.writeString8(desktop_file_hint);
-
-    remote()->transact(
-        ON_SESSION_FOCUSED_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-void BpApplicationManagerObserver::on_keyboard_geometry_changed(int x,
-                                                                int y,
-                                                                int width,
-                                                                int height)
-{
-    Parcel in, out;
-    in.writeInt32(x);
-    in.writeInt32(y);
-    in.writeInt32(width);
-    in.writeInt32(height);
-
-    remote()->transact(
-        ON_KEYBOARD_GEOMETRY_CHANGED_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-void BpApplicationManagerObserver::on_session_requested_fullscreen(int id,
-                                                                   int stage_hint,
-                                                                   const String8& desktop_file_hint)
-{
-    Parcel in, out;
-    in.writeInt32(id);
-    in.writeInt32(stage_hint);
-    in.writeString8(desktop_file_hint);
-
-    remote()->transact(
-        ON_SESSION_REQUESTED_FULLSCREEN_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-void BpApplicationManagerObserver::on_session_died(int id,
-                                                   int stage_hint,
-                                                   const String8& desktop_file_hint)
-{
-    Parcel in, out;
-    in.writeInt32(id);
-    in.writeInt32(stage_hint);
-    in.writeString8(desktop_file_hint);
-
-    remote()->transact(
-        ON_SESSION_DIED_NOTIFICATION,
-        in,
-        &out,
-        android::IBinder::FLAG_ONEWAY);
-}
-
-BnApplicationManager::BnApplicationManager()
-{
-}
-
-BnApplicationManager::~BnApplicationManager()
-{
-}
-
-status_t BnApplicationManager::onTransact(uint32_t code,
-        const Parcel& data,
-        Parcel* reply,
-        uint32_t flags)
-{
-    switch(code)
-    {
-    case START_A_NEW_SESSION_COMMAND:
-    {
-        int32_t session_type = data.readInt32();
-        int32_t stage_hint = data.readInt32();
-        String8 app_name = data.readString8();
-        String8 desktop_file = data.readString8();
-        sp<IBinder> binder = data.readStrongBinder();
-        sp<BpApplicationManagerSession> session(new BpApplicationManagerSession(binder));
-        int fd = data.readFileDescriptor();
-        uint32_t remote_pid = data.readInt32();
-
-        start_a_new_session(session_type, stage_hint, app_name, desktop_file, session, fd, remote_pid);
-    }
-    break;
-    case REGISTER_A_SURFACE_COMMAND:
-    {
-        String8 title = data.readString8();
-        sp<IBinder> binder = data.readStrongBinder();
-        sp<BpApplicationManagerSession> session(new BpApplicationManagerSession(binder));
-        int32_t surface_role = data.readInt32();
-        int32_t surface_token = data.readInt32();
-        int fd = data.readFileDescriptor();
-
-        register_a_surface(title, session, surface_role, surface_token, fd);
-    }
-    break;
-    case GET_SESSION_PID_COMMAND:
-    {
-        sp<IBinder> binder = data.readStrongBinder();
-        sp<BpApplicationManagerSession> session(new BpApplicationManagerSession(binder));
-        int pid = get_session_pid(session);
-        reply->writeInt32(pid);
-    }
-    break;
-    case REQUEST_FULLSCREEN_COMMAND:
-    {
-        sp<IBinder> binder = data.readStrongBinder();
-        sp<BpApplicationManagerSession> session(new BpApplicationManagerSession(binder));
-        request_fullscreen(session);
-    }
-    break;
-    case REGISTER_AN_OBSERVER_COMMAND:
-    {
-        sp<IBinder> binder = data.readStrongBinder();
-        sp<BpApplicationManagerObserver> observer(new BpApplicationManagerObserver(binder));
-        register_an_observer(observer);
-        break;
-    }
-    case REGISTER_TASK_CONTROLLER_COMMAND:
-    {
-        sp<IBinder> binder = data.readStrongBinder();
-        sp<BpAMTaskController> controller(new BpAMTaskController(binder));
-        register_task_controller(controller);
-        break;
-    }
-    case REQUEST_UPDATE_FOR_SESSION_COMMAND:
-    {
-        sp<IBinder> binder = data.readStrongBinder();
-        sp<BpApplicationManagerSession> session(new BpApplicationManagerSession(binder));
-        request_update_for_session(session);
-        break;
-    }
-    case UNFOCUS_RUNNING_SESSIONS_COMMAND:
-    {
-        unfocus_running_sessions();
-        break;
-    }
-    case FOCUS_RUNNING_SESSION_WITH_ID_COMMAND:
-    {
-        int32_t id = data.readInt32();
-        focus_running_session_with_id(id);
-        break;
-    }
-    case QUERY_SNAPSHOT_LAYER_FOR_SESSION_WITH_ID_COMMAND:
-    {
-        int32_t id = data.readInt32();
-        int32_t layer = query_snapshot_layer_for_session_with_id(id);
-        reply->writeInt32(layer);
-        break;
-    }     
-    case QUERY_SURFACE_PROPERTIES_FOR_SESSION_ID_COMMAND:
-    {
-        int32_t id = data.readInt32();
-        IApplicationManagerSession::SurfaceProperties props =
-                    query_surface_properties_for_session_id(id);
-        reply->writeInt32(props.layer);
-        reply->writeInt32(props.left);
-        reply->writeInt32(props.top);
-        reply->writeInt32(props.right);
-        reply->writeInt32(props.bottom);
-        break;
-    }
-    case SWITCH_TO_WELL_KNOWN_APPLICATION_COMMAND:
-    {
-        int32_t app = data.readInt32();
-        switch_to_well_known_application(app);
-        break;
-    }
-    case SET_SURFACE_TRAP_COMMAND:
-    {
-        int32_t x = data.readInt32();
-        int32_t y = data.readInt32();
-        int32_t width = data.readInt32();
-        int32_t height = data.readInt32();
-        int32_t handle = set_surface_trap(x, y, width, height);
-        reply->writeInt32(handle);
-        break;
-    }
-    case UNSET_SURFACE_TRAP_COMMAND:
-    {
-        int32_t handle = data.readInt32();
-        unset_surface_trap(handle);
-        break;
-    }
-    case REPORT_OSK_VISIBLE_COMMAND:
-    {
-        int32_t x = data.readInt32();
-        int32_t y = data.readInt32();
-        int32_t width = data.readInt32();
-        int32_t height = data.readInt32();
-        report_osk_visible(x, y, width, height);
-        break;
-    }
-    case REPORT_OSK_INVISIBLE_COMMAND:
-    {
-        report_osk_invisible();
-        break;
-    }
-    case REPORT_NOTIFICATION_VISIBLE_COMMAND:
-    {
-        report_notification_visible();
-        break;
-    }
-    case REPORT_NOTIFICATION_INVISIBLE_COMMAND:
-    {
-        report_notification_invisible();
-        break;
-    }
-    }
-    return NO_ERROR;
-}
-
-BpApplicationManager::BpApplicationManager(const sp<IBinder>& impl)
-    : BpInterface<IApplicationManager>(impl)
-{
-}
-
-BpApplicationManager::~BpApplicationManager()
-{
-}
-
-void BpApplicationManager::start_a_new_session(
-    int32_t session_type,
-    int32_t stage_hint,
-    const String8& app_name,
-    const String8& desktop_file,
-    const sp<IApplicationManagerSession>& session,
-    int fd,
-    uint32_t remote_pid)
-{
-    //printf("%s \n", __PRETTY_FUNCTION__);
-    Parcel in, out;
-    in.pushAllowFds(true);
-    in.writeInt32(session_type);
-    in.writeInt32(stage_hint);
-    in.writeString8(app_name);
-    in.writeString8(desktop_file);
-    in.writeStrongBinder(session->asBinder());
-    in.writeFileDescriptor(fd);
-    in.writeInt32(remote_pid);
-
-    remote()->transact(START_A_NEW_SESSION_COMMAND,
-                       in,
-                       &out);
-}
-
-void BpApplicationManager::register_a_surface(
-    const String8& title,
-    const sp<IApplicationManagerSession>& session,
-    int32_t surface_role,
-    int32_t token,
-    int fd)
-{
-    //printf("%s \n", __PRETTY_FUNCTION__);
-    Parcel in, out;
-    in.pushAllowFds(true);
-    in.writeString8(title);
-    in.writeStrongBinder(session->asBinder());
-    in.writeInt32(surface_role);
-    in.writeInt32(token);
-    in.writeFileDescriptor(fd);
-
-    remote()->transact(REGISTER_A_SURFACE_COMMAND,
-                       in,
-                       &out);
-}
-
-int BpApplicationManager::get_session_pid(
-    const sp<IApplicationManagerSession>& session)
-{
-    Parcel in, out;
-    in.writeStrongBinder(session->asBinder());
-
-    remote()->transact(GET_SESSION_PID_COMMAND,
-                       in,
-                       &out);                   
-    
-    int32_t pid = out.readInt32();
-
-    return pid; 
-}
-
-
-void BpApplicationManager::request_fullscreen(
-    const sp<IApplicationManagerSession>& session)
-{
-    //printf("%s \n", __PRETTY_FUNCTION__);
-    Parcel in, out;
-    in.writeStrongBinder(session->asBinder());
-
-    remote()->transact(REQUEST_FULLSCREEN_COMMAND,
-                       in,
-                       &out);
-}
-
-void BpApplicationManager::register_task_controller(const sp<IAMTaskController>& controller)
-{
-    Parcel in, out;
-    in.writeStrongBinder(controller->asBinder());
-
-    remote()->transact(REGISTER_TASK_CONTROLLER_COMMAND,
-                       in,
-                       &out);
-}
-
-void BpApplicationManager::register_an_observer(const sp<IApplicationManagerObserver>& observer)
-{
-    Parcel in, out;
-    in.writeStrongBinder(observer->asBinder());
-
-    remote()->transact(REGISTER_AN_OBSERVER_COMMAND,
-                       in,
-                       &out);
-}
-
-void BpApplicationManager::request_update_for_session(const sp<IApplicationManagerSession>& session)
-{
-    Parcel in, out;
-    in.writeStrongBinder(session->asBinder());
-    remote()->transact(REQUEST_UPDATE_FOR_SESSION_COMMAND,
-                       in,
-                       &out);
-}
-
-void BpApplicationManager::unfocus_running_sessions()
-{
-    Parcel in, out;
-
-    remote()->transact(UNFOCUS_RUNNING_SESSIONS_COMMAND,
-                       in,
-                       &out);
-}
-
-void BpApplicationManager::focus_running_session_with_id(int id)
-{
-    Parcel in, out;
-    in.writeInt32(id);
-
-    remote()->transact(FOCUS_RUNNING_SESSION_WITH_ID_COMMAND,
-                       in,
-                       &out);
-}
-
-int32_t BpApplicationManager::query_snapshot_layer_for_session_with_id(int id)
-{
-    Parcel in, out;
-    in.writeInt32(id);
-    remote()->transact(QUERY_SNAPSHOT_LAYER_FOR_SESSION_WITH_ID_COMMAND,
-                       in,
-                       &out);
-
-    int32_t layer = out.readInt32();
-    return layer;
-}
-
-IApplicationManagerSession::SurfaceProperties BpApplicationManager::query_surface_properties_for_session_id(int id)
-{
-    Parcel in, out;
-    in.writeInt32(id);
-
-    remote()->transact(QUERY_SURFACE_PROPERTIES_FOR_SESSION_ID_COMMAND,
-                       in,
-                       &out);
-
-    IApplicationManagerSession::SurfaceProperties props; 
-    props.layer = out.readInt32();
-    props.left = out.readInt32();
-    props.top = out.readInt32();
-    props.right = out.readInt32();
-    props.bottom = out.readInt32();
-
-    return props;
-}
-void BpApplicationManager::switch_to_well_known_application(int32_t app)
-{
-    Parcel in, out;
-    in.writeInt32(app);
-
-    remote()->transact(SWITCH_TO_WELL_KNOWN_APPLICATION_COMMAND,
-                       in,
-                       &out);
-}
-
-int32_t BpApplicationManager::set_surface_trap(int32_t x, int32_t y, int32_t width, int32_t height)
-{
-    Parcel in, out;
-    in.writeInt32(x);
-    in.writeInt32(y);
-    in.writeInt32(width);
-    in.writeInt32(height);
-
-    remote()->transact(SET_SURFACE_TRAP_COMMAND,
-                       in,
-                       &out);
-
-    int32_t handle = out.readInt32();
-
-    return handle;
-}
-
-void BpApplicationManager::unset_surface_trap(int32_t handle)
-{
-    Parcel in, out;
-    in.writeInt32(handle);
-
-    remote()->transact(UNSET_SURFACE_TRAP_COMMAND,
-                       in,
-                       &out);
-}
-
-void BpApplicationManager::report_osk_visible(int32_t x, int32_t y, int32_t width, int32_t height)
-{
-    Parcel in, out;
-    in.writeInt32(x);
-    in.writeInt32(y);
-    in.writeInt32(width);
-    in.writeInt32(height);
-
-    remote()->transact(REPORT_OSK_VISIBLE_COMMAND,
-                       in,
-                       &out);
-}
-    
-void BpApplicationManager::report_osk_invisible()
-{
-    Parcel in, out;
-
-    remote()->transact(REPORT_OSK_INVISIBLE_COMMAND,
-                       in,
-                       &out);
-}
-    
-void BpApplicationManager::report_notification_visible()
-{
-    Parcel in, out;
-
-    remote()->transact(REPORT_NOTIFICATION_VISIBLE_COMMAND,
-                       in,
-                       &out);
-}
-    
-void BpApplicationManager::report_notification_invisible()
-{
-    Parcel in, out;
-
-    remote()->transact(REPORT_NOTIFICATION_INVISIBLE_COMMAND,
-                       in,
-                       &out);
-}
-
-}

=== removed file 'android/hybris/application_manager.h'
--- android/hybris/application_manager.h	2013-06-07 01:08:41 +0000
+++ android/hybris/application_manager.h	1970-01-01 00:00:00 +0000
@@ -1,412 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef HYBRIS_APPLICATION_MANAGER_H_
-#define HYBRIS_APPLICATION_MANAGER_H_
-
-#include <binder/IInterface.h>
-#include <utils/String8.h>
-
-namespace android
-{
-
-class IClipboardService : public IInterface
-{
-public:
-    DECLARE_META_INTERFACE(ClipboardService);
-
-    static const char* exported_service_name()
-    {
-        return "UbuntuClipboardService";
-    }
-
-    struct Content
-    {
-        Content();
-        Content(const String8& mime_type, void* data, size_t data_size);
-        ~Content();
-        Content(const Content& rhs);
-        Content& operator=(const Content& rhs);
-        
-        String8 mime_type;
-        void* data;
-        size_t data_size;
-    };
-
-    virtual void set_content(const Content& content) = 0;
-    virtual void get_content(Content& content) = 0;
-
-protected:
-    enum
-    {
-        SET_CLIPBOARD_CONTENT_COMMAND = IBinder::FIRST_CALL_TRANSACTION,
-        GET_CLIPBOARD_CONTENT_COMMAND
-    };
-};
-
-class BnClipboardService : public BnInterface<IClipboardService>
-{
-  public:
-    status_t onTransact(uint32_t code,
-                        const Parcel& data,
-                        Parcel* reply,
-                        uint32_t flags = 0);
-};
-
-class BpClipboardService : public BpInterface<IClipboardService>
-{
-public:
-    BpClipboardService(const sp<IBinder>& impl);
-    
-    void set_content(const IClipboardService::Content& content);
-    void get_content(IClipboardService::Content& content);
-
-};
-
-class IApplicationManagerSession : public IInterface
-{
-public:
-    DECLARE_META_INTERFACE(ApplicationManagerSession);
-
-    struct SurfaceProperties
-    {
-        int32_t layer;
-        int32_t left;
-        int32_t top;
-        int32_t right;
-        int32_t bottom;
-    };
-
-    virtual void raise_application_surfaces_to_layer(int layer) = 0;
-    virtual void raise_surface_to_layer(int32_t token, int layer) = 0;
-    virtual SurfaceProperties query_surface_properties_for_token(int32_t token) = 0;
-    virtual void on_application_resumed() = 0;
-    virtual void on_application_about_to_stop() = 0;
-
-protected:
-    enum
-    {
-        RAISE_APPLICATION_SURFACES_TO_LAYER_COMMAND = IBinder::FIRST_CALL_TRANSACTION,
-        RAISE_SURFACE_TO_LAYER_COMMAND,
-        QUERY_SURFACE_PROPERTIES_FOR_TOKEN_COMMAND,
-        ON_APPLICATION_STARTED_NOTIFICATION,
-        ON_APPLICATION_ABOUT_TO_STOP_NOTIFICATION,
-    };
-};
-
-class BnApplicationManagerSession : public BnInterface<IApplicationManagerSession>
-{
-public:
-    BnApplicationManagerSession();
-    virtual ~BnApplicationManagerSession();
-
-    virtual status_t onTransact(uint32_t code,
-                                const Parcel& data,
-                                Parcel* reply,
-                                uint32_t flags = 0);
-};
-
-class BpApplicationManagerSession : public BpInterface<IApplicationManagerSession>
-{
-public:
-    BpApplicationManagerSession(const sp<IBinder>& impl);
-    ~BpApplicationManagerSession();
-
-    void raise_application_surfaces_to_layer(int layer);
-    void raise_surface_to_layer(int32_t token, int layer);
-    IApplicationManagerSession::SurfaceProperties query_surface_properties_for_token(int32_t token);
-    void on_application_resumed();
-    void on_application_about_to_stop();
-};
-
-class IAMTaskController : public IInterface
-{
-public:
-    DECLARE_META_INTERFACE(AMTaskController);
-
-    virtual void continue_task(uint32_t pid) = 0;
-
-    virtual void suspend_task(uint32_t pid) = 0;
-
-protected:
-    enum
-    {
-        CONTINUE_TASK_COMMAND = IBinder::FIRST_CALL_TRANSACTION,
-        SUSPEND_TASK_COMMAND
-    };
-
-    IAMTaskController(const IAMTaskController&) = delete;
-    IAMTaskController& operator=(const IAMTaskController&) = delete;
-};
-
-class BnAMTaskController : public BnInterface<IAMTaskController>
-{
-public:
-    status_t onTransact(uint32_t code,
-                        const Parcel& data,
-                        Parcel* reply,
-                        uint32_t flags = 0);
-};
-
-class BpAMTaskController : public BpInterface<IAMTaskController>
-{
-public:
-    BpAMTaskController(const sp<IBinder>& impl);
-
-    void continue_task(uint32_t pid);
-
-    void suspend_task(uint32_t pid);
-};
-
-class IApplicationManagerObserver : public IInterface
-{
-public:
-    DECLARE_META_INTERFACE(ApplicationManagerObserver);
-
-    virtual void on_session_requested(uint32_t app) = 0;
-
-    virtual void on_session_born(int id,
-                                 int stage_hint,
-                                 const String8& desktop_file) = 0;
-    
-    virtual void on_session_unfocused(int id,
-                                      int stage_hint,
-                                      const String8& desktop_file) = 0;
-
-    virtual void on_session_focused(int id,
-                                    int stage_hint,
-                                    const String8& desktop_file) = 0;
-
-    virtual void on_session_requested_fullscreen(int id,
-                                                 int stage_hint,
-                                                 const String8& desktop_file) = 0;
-
-    virtual void on_keyboard_geometry_changed(int x,
-                                              int y,
-                                              int width,
-                                              int height) = 0;
-
-    virtual void on_session_died(int id,
-                                 int stage_hint,
-                                 const String8& desktop_file) = 0;
-
-protected:
-    enum
-    {
-        ON_SESSION_REQUESTED_NOTIFICATION = IBinder::FIRST_CALL_TRANSACTION,
-        ON_SESSION_BORN_NOTIFICATION,
-        ON_SESSION_UNFOCUSED_NOTIFICATION,
-        ON_SESSION_FOCUSED_NOTIFICATION,
-        ON_KEYBOARD_GEOMETRY_CHANGED_NOTIFICATION,
-        ON_SESSION_REQUESTED_FULLSCREEN_NOTIFICATION,
-        ON_SESSION_DIED_NOTIFICATION
-    };
-
-    IApplicationManagerObserver(const IApplicationManagerObserver&) = delete;
-    IApplicationManagerObserver& operator=(const IApplicationManagerObserver&) = delete;
-};
-
-class BnApplicationManagerObserver : public BnInterface<IApplicationManagerObserver>
-{
-public:
-    status_t onTransact(uint32_t code,
-                        const Parcel& data,
-                        Parcel* reply,
-                        uint32_t flags = 0);
-};
-
-class BpApplicationManagerObserver : public BpInterface<IApplicationManagerObserver>
-{
-public:
-    BpApplicationManagerObserver(const sp<IBinder>& impl);
-
-    void on_session_requested(uint32_t app);
-
-    void on_session_born(int id,
-                         int stage_hint,
-                         const String8& desktop_file);
-
-    void on_session_unfocused(int id,
-                              int stage_hint,
-                              const String8& desktop_file);
-
-    void on_session_focused(int id,
-                            int stage_hint,
-                            const String8& desktop_file);
-
-    void on_session_requested_fullscreen(int id,
-                                         int stage_hint,
-                                         const String8& desktop_file);
-
-    void on_keyboard_geometry_changed(int x,
-                                      int y,
-                                      int width,
-                                      int height); 
-
-    void on_session_died(int id,
-                         int stage_hint,
-                         const String8& desktop_file);
-};
-
-class IApplicationManager : public IInterface
-{
-public:
-    DECLARE_META_INTERFACE(ApplicationManager);
-
-    static const char* exported_service_name()
-    {
-        return "UbuntuApplicationManager";
-    }
-
-    virtual void start_a_new_session(int32_t session_type,
-                                     int32_t stage_hint,
-                                     const String8& app_name,
-                                     const String8& desktop_file,
-                                     const sp<IApplicationManagerSession>& session,
-                                     int fd,
-                                     uint32_t remote_pid) = 0;
-
-    virtual void register_a_surface(const String8& title,
-                                    const sp<IApplicationManagerSession>& session,
-                                    int32_t surface_role,
-                                    int32_t token,
-                                    int fd) = 0;
-
-    virtual int get_session_pid(const sp<IApplicationManagerSession>& session) = 0;
-
-    virtual void request_fullscreen(const sp<IApplicationManagerSession>& session) = 0;
-
-    virtual void request_update_for_session(const sp<IApplicationManagerSession>& session) = 0;
-
-    virtual void register_an_observer(const sp<IApplicationManagerObserver>& observer) = 0;
-
-    virtual void register_task_controller(const sp<IAMTaskController>& controller) = 0;
-
-    virtual void unfocus_running_sessions() = 0;
-
-    virtual void focus_running_session_with_id(int id) = 0;
-
-    virtual int32_t query_snapshot_layer_for_session_with_id(int id) = 0;
-    
-    virtual IApplicationManagerSession::SurfaceProperties query_surface_properties_for_session_id(int id) = 0;
-    
-    virtual void switch_to_well_known_application(int32_t app) = 0;
-
-    virtual int32_t set_surface_trap(int32_t x, int32_t y, int32_t width, int32_t height) = 0;
-
-    virtual void unset_surface_trap(int32_t handle) = 0;
-    
-    virtual void report_osk_visible(int32_t x, int32_t y, int32_t width, int32_t height) = 0;
-    
-    virtual void report_osk_invisible() = 0;
-    
-    virtual void report_notification_visible() = 0;
-    
-    virtual void report_notification_invisible() = 0;
-
-protected:
-    enum
-    {
-        START_A_NEW_SESSION_COMMAND = IBinder::FIRST_CALL_TRANSACTION,
-        REGISTER_A_SURFACE_COMMAND,
-        GET_SESSION_PID_COMMAND,
-        REQUEST_FULLSCREEN_COMMAND,
-        REGISTER_AN_OBSERVER_COMMAND,
-        REGISTER_TASK_CONTROLLER_COMMAND,
-        REQUEST_UPDATE_FOR_SESSION_COMMAND,
-        UNFOCUS_RUNNING_SESSIONS_COMMAND,
-        FOCUS_RUNNING_SESSION_WITH_ID_COMMAND,
-        QUERY_SNAPSHOT_LAYER_FOR_SESSION_WITH_ID_COMMAND,
-        QUERY_SURFACE_PROPERTIES_FOR_SESSION_ID_COMMAND,
-        SWITCH_TO_WELL_KNOWN_APPLICATION_COMMAND,
-        SET_SURFACE_TRAP_COMMAND,
-        UNSET_SURFACE_TRAP_COMMAND,
-        REPORT_OSK_VISIBLE_COMMAND,
-        REPORT_OSK_INVISIBLE_COMMAND,
-        REPORT_NOTIFICATION_VISIBLE_COMMAND,
-        REPORT_NOTIFICATION_INVISIBLE_COMMAND
-    };
-};
-
-class BnApplicationManager : public BnInterface<IApplicationManager>
-{
-public:
-    BnApplicationManager();
-    virtual ~BnApplicationManager();
-
-    virtual status_t onTransact(uint32_t code,
-                                const Parcel& data,
-                                Parcel* reply,
-                                uint32_t flags = 0);
-};
-
-class BpApplicationManager : public BpInterface<IApplicationManager>
-{
-public:
-    BpApplicationManager(const sp<IBinder>& impl);
-    ~BpApplicationManager();
-
-    void start_a_new_session(int32_t session_type,
-                             int32_t stage_hint,
-                             const String8& app_name,
-                             const String8& desktop_file,
-                             const sp<IApplicationManagerSession>& session,
-                             int fd,
-                             uint32_t remote_pid);
-
-    void register_a_surface(const String8& title,
-                            const android::sp<android::IApplicationManagerSession>& session,
-                            int32_t surface_role,
-                            int32_t token,
-                            int fd);
-
-    int get_session_pid(const android::sp<android::IApplicationManagerSession>& session);
-
-    void request_fullscreen(const android::sp<android::IApplicationManagerSession>& session);
-
-    void request_update_for_session(const sp<IApplicationManagerSession>& session);
-
-    void register_an_observer(const sp<IApplicationManagerObserver>& observer);
-
-    void register_task_controller(const sp<IAMTaskController>& controller);
-    
-    void unfocus_running_sessions();
-
-    void focus_running_session_with_id(int id);
-    
-    int32_t query_snapshot_layer_for_session_with_id(int id);
-    
-    IApplicationManagerSession::SurfaceProperties query_surface_properties_for_session_id(int id);
-    
-    void switch_to_well_known_application(int32_t app);
-
-    int32_t set_surface_trap(int32_t x, int32_t y, int32_t width, int32_t height);
-
-    void unset_surface_trap(int handle);
-
-    void report_osk_visible(int32_t x, int32_t y, int32_t width, int32_t height);
-    
-    void report_osk_invisible();
-    
-    void report_notification_visible();
-    
-    void report_notification_invisible();
-};
-
-}
-
-#endif // HYBRIS_APPLICATION_MANAGER_H_

=== removed file 'android/hybris/default_application_manager.cpp'
--- android/hybris/default_application_manager.cpp	2014-01-22 05:28:18 +0000
+++ android/hybris/default_application_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,1257 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#undef LOG_TAG
-#define LOG_TAG "ubuntu::detail::ApplicationManager"
-
-#include "default_application_manager.h"
-
-#include "default_application_manager_input_setup.h"
-#include "default_application_session.h"
-#include "default_shell.h"
-
-#include <binder/IPCThreadState.h>
-#include <binder/IServiceManager.h>
-#include <binder/ProcessState.h>
-
-#include <input/InputListener.h>
-#include <input/InputReader.h>
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
-#include <androidfw/InputTransport.h>
-#else
-#include <input/InputTransport.h>
-#endif
-#include <utils/threads.h>
-#include <utils/Errors.h>
-#include <utils/Timers.h>
-
-#include <cstdio>
-#include <cstdlib>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <fcntl.h>
-
-namespace ubuntu { namespace detail
-{
-
-template<typename T, typename U>
-const T& min(const T& lhs, const U& rhs)
-{
-    return lhs < rhs ? lhs : rhs;
-}
-
-/* TODO: Currently we need to map local pids to the ones of the
- * container where Ubuntu is running as sessions need to be 
- * referenced to observers in terms of the said namespace.
- */
-pid_t pid_to_vpid(int pid)
-{
-    ALOGI("%s(%d)", __PRETTY_FUNCTION__, pid);
-    
-    if (pid <= 0)
-        return -1;
-
-    char proc_name[128], buf[1024];
-    char *rpid;
-    char key[] = "Vpid:";
-
-    sprintf(proc_name, "/proc/%d/status", pid);
-
-    int fd;
-
-    fd = open(proc_name, O_RDONLY);
-    if (fd < 0)
-    {
-        ALOGI("%s(): Cannot find %s\n", __PRETTY_FUNCTION__, proc_name);
-        return -1;
-    }
-
-    memset(buf, '\0', sizeof(buf));
-    read(fd, buf, sizeof(buf));
-    rpid = strstr(buf, key);
-
-    close(fd);
-
-    if (rpid == NULL)
-    {
-        ALOGI("%s(): Vpid not supported\n", __PRETTY_FUNCTION__);
-        return pid;    
-    }
-   
-    return atoi(rpid+sizeof(key));   
-}
-
-bool is_session_allowed_to_run_in_background(
-    const android::sp<ubuntu::detail::ApplicationSession>& session)
-{
-    ALOGI("%s: %s", __PRETTY_FUNCTION__, session->desktop_file.string());
-    static const android::String8 phone_app_desktop_file("/usr/share/applications/phone-app.desktop");
-    static const android::String8 music_app_desktop_file("/usr/share/applications/music-app.desktop");
-
-    if (session->desktop_file == phone_app_desktop_file ||
-        session->desktop_file == music_app_desktop_file)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-bool write_proc_file(pid_t pid, const char* filename, const char* value)
-{
-    char proc_name[128];
-    sprintf(proc_name, "/proc/%d/%s", pid, filename);
-
-    int file;
-    
-    if (access(proc_name, F_OK) == 0)
-    {
-        file = open(proc_name, O_WRONLY);
-        write(file, value, sizeof(value));
-        close(file);
-        return true;
-    } else
-        return false;
-}
-
-void update_oom_values(const android::sp<ubuntu::detail::ApplicationSession>& session)
-{
-    if (session->session_type == ubuntu::application::ui::system_session_type)
-    {
-        if (!write_proc_file(session->pid, "oom_score_adj", "-940"))
-            write_proc_file(session->pid, "oom_adj", "-16");
-        return;
-    }
-
-    if (session->running_state == ubuntu::application::ui::process_suspended)
-    {
-        if (!write_proc_file(session->pid, "oom_score_adj", "1000"))
-            write_proc_file(session->pid, "oom_adj", "15");
-    } else
-    {
-        if (!write_proc_file(session->pid, "oom_score_adj", "0"))
-            write_proc_file(session->pid, "oom_adj", "0");
-    }
-}
-
-template<int x, int y, int w, int h>
-int ApplicationManager::ShellInputSetup::Window<x, y, w, h>::looper_callback(int receiveFd, int events, void* ctxt)
-{
-    // ALOGI("%s", __PRETTY_FUNCTION__);
-
-    bool result = true;
-    ApplicationManager::ShellInputSetup::Window<x, y, w, h>* window = static_cast<ApplicationManager::ShellInputSetup::Window<x, y, w, h>*>(ctxt);
-    
-    //window->input_consumer.receiveDispatchSignal();
-    uint32_t seq;
-    android::InputEvent* ev;
-    static const bool consume_batches = true;
-    static const nsecs_t frame_time = -1;
-    switch(window->input_consumer.consume(&window->event_factory, consume_batches, frame_time, &seq, &ev))
-    {
-        case android::OK:
-            result = true;
-            //printf("We have a client side event for process %d. \n", getpid());
-            window->input_consumer.sendFinishedSignal(seq, result);
-            break;
-        case android::INVALID_OPERATION:
-            result = true;
-            break;
-        case android::NO_MEMORY:
-            result = true;
-            break;
-    }
-
-    return result ? 1 : 0;
-}
-
-template<int x, int y, int w, int h>
-ApplicationManager::ShellInputSetup::Window<x, y, w, h>::Window(
-    ApplicationManager::ShellInputSetup* parent,
-    int _x,
-    int _y,
-    int _w,
-    int _h) : parent(parent),
-              input_consumer(client_channel)
-{
-    auto window = new android::InputSetup::DummyApplicationWindow(
-        parent->shell_application,
-        _x,
-        _y,
-        _w,
-        _h);
-    
-    android::InputChannel::openInputChannelPair(
-        android::String8("DummyShellInputChannel"),
-        server_channel,
-        client_channel);
-    
-    window->input_channel = server_channel;
-    input_window = window;
-
-    parent->input_manager->getDispatcher()->registerInputChannel(
-        window->input_channel,
-        input_window,
-        false);
-
-    input_consumer = android::InputConsumer(client_channel);
-
-    // input_consumer.initialize();
-    parent->looper->addFd(client_channel->getFd(), //client_channel->getReceivePipeFd(),
-                          0,
-                          ALOOPER_EVENT_INPUT,
-                          looper_callback,
-                          this);
-}
-
-ApplicationManager::ShellInputSetup::DisplayInfo::DisplayInfo()
-{
-    auto display = android::SurfaceComposerClient::getBuiltInDisplay(
-        android::ISurfaceComposer::eDisplayIdMain);
-    
-    android::SurfaceComposerClient::getDisplayInfo(
-        display,
-        &info);
-}
-
-ApplicationManager::ShellInputSetup::ShellInputSetup(const android::sp<android::InputManager>& input_manager)
-        : shell_has_focus(true),
-          input_manager(input_manager),
-          shell_application(new android::InputSetup::DummyApplication()),
-          looper(new android::Looper(true)),
-          event_loop(looper),
-          event_trap_window(this, 0, 0, display_info.info.w, display_info.info.h),
-          osk_window(this),
-          notifications_window(this)
-{
-    event_loop.run();
-}
-
-ApplicationManager::InputFilter::InputFilter(ApplicationManager* manager) : manager(manager)
-{
-}
-
-bool ApplicationManager::InputFilter::filter_event(const android::InputEvent* event)
-{
-    bool result = true;
-
-    switch (event->getType())
-    {
-        case AINPUT_EVENT_TYPE_KEY:
-            result = handle_key_event(static_cast<const android::KeyEvent*>(event));
-            break;
-    }
-
-    return result;
-}
-
-bool ApplicationManager::InputFilter::handle_key_event(const android::KeyEvent* event)
-{
-    bool result = true;
-
-    return result;
-}
-
-ApplicationManager::LockingIterator::LockingIterator(
-    ApplicationManager* manager,
-    size_t index) : manager(manager),
-                    it(index)
-{
-}
-
-void ApplicationManager::LockingIterator::advance()
-{
-    it += 1;
-}
-
-bool ApplicationManager::LockingIterator::is_valid() const
-{
-    return it < manager->apps.size();
-}
-
-void ApplicationManager::LockingIterator::make_current()
-{
-    //printf("%s \n", __PRETTY_FUNCTION__);
-}
-
-const android::sp<ubuntu::detail::ApplicationSession>& ApplicationManager::LockingIterator::operator*()
-{
-    return manager->apps.valueFor(manager->apps_as_added[it]);
-}
-
-ApplicationManager::LockingIterator::~LockingIterator()
-{
-    manager->unlock();
-}
-
-ApplicationManager::ApplicationManager() : input_filter(new InputFilter(this)),
-                                           input_setup(new android::InputSetup(input_filter)),
-                                           is_osk_visible(false),
-                                           are_notifications_visible(false),
-                                           app_manager_task_controller(NULL),
-                                           focused_application(0),
-                                           side_stage_application(0),
-                                           main_stage_application(0)
-{
-    shell_input_setup = new ShellInputSetup(input_setup->input_manager);
-
-    input_setup->input_manager->getDispatcher()->setFocusedApplication(
-        shell_input_setup->shell_application);
-    
-    android::Vector< android::sp<android::InputWindowHandle> > input_windows;
-    input_windows.push(shell_input_setup->event_trap_window.input_window);
-    input_setup->input_manager->getDispatcher()->setInputWindows(
-        input_windows);
-
-    input_setup->start();
-}
-
-void ApplicationManager::update_app_lists()
-{
-    int idx;
-
-    for (idx = apps_as_added.size()-1; idx >= 0; idx--)
-    {
-        const android::sp<ubuntu::detail::ApplicationSession>& session =
-                apps.valueFor(apps_as_added[idx]);
-
-        if (session->session_type == ubuntu::application::ui::system_session_type)
-            continue;
-
-        if (session->stage_hint == ubuntu::application::ui::side_stage)
-        {
-            side_stage_application = idx;
-            break;
-        }
-    }
-
-    if (idx < 0)
-        side_stage_application = 0;
-
-    for (idx = apps_as_added.size()-1; idx >= 0; idx--)
-    {
-        const android::sp<ubuntu::detail::ApplicationSession>& session =
-                apps.valueFor(apps_as_added[idx]);
-        
-        if (session->session_type == ubuntu::application::ui::system_session_type)
-            continue;
-
-        if (session->stage_hint == ubuntu::application::ui::main_stage)
-        {
-            main_stage_application = idx;
-            break;
-        }
-    }
-
-    if (idx < 0)
-        main_stage_application = 0;
-}
-
-// From DeathRecipient
-void ApplicationManager::binderDied(const android::wp<android::IBinder>& who)
-{
-    android::Mutex::Autolock al(guard);
-    android::sp<android::IBinder> sp = who.promote();
-
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-    
-    const android::sp<ubuntu::detail::ApplicationSession>& dead_session = apps.valueFor(sp);
-
-    ALOGI("%s():%d -- remote_pid=%d desktop_file=%s\n", __PRETTY_FUNCTION__, __LINE__,
-                                                       dead_session->remote_pid,
-                                                       dead_session->desktop_file.string());
-
-    notify_observers_about_session_died(dead_session->remote_pid,
-                                        dead_session->stage_hint,
-                                        dead_session->desktop_file);
-
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-    size_t i = 0;
-    for(i = 0; i < apps_as_added.size(); i++)
-        if (apps_as_added[i] == sp)
-            break;
-
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-    size_t next_focused_app = 0;
-    next_focused_app = apps_as_added.removeAt(i);
-
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-    next_focused_app = main_stage_application;
-    update_app_lists();
-   
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-    if (dead_session->stage_hint == ubuntu::application::ui::side_stage)
-        next_focused_app = side_stage_application ? side_stage_application : next_focused_app;
-
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-    if (dead_session->stage_hint == ubuntu::application::ui::main_stage)
-        next_focused_app = main_stage_application;
-
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-    if (i && i == focused_application &&
-        shell_input_setup->shell_has_focus == false)
-    {
-        switch_focused_application_locked(next_focused_app);
-    }
-    else if(focused_application > i) 
-        focused_application--;
-   
-    if (i == 0)
-    {
-        shell_input_setup->trap_windows.clear();
-        shell_input_setup->shell_has_focus = true;
-    }
-    
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-    apps.removeItem(sp);
-    ALOGI("%s():%d\n", __PRETTY_FUNCTION__, __LINE__);
-}
-
-void ApplicationManager::lock()
-{
-    guard.lock();
-}
-
-void ApplicationManager::unlock()
-{
-    guard.unlock();
-}
-
-android::sp<ApplicationManager::LockingIterator> ApplicationManager::iterator()
-{
-    lock();
-    android::sp<ApplicationManager::LockingIterator> it(
-        new ApplicationManager::LockingIterator(this, 0));
-
-    return it;
-}
-
-void ApplicationManager::session_set_state(const android::sp<ubuntu::detail::ApplicationSession>& as,
-                                           int32_t new_state)
-{
-    ALOGI("%s():%d running->running", __PRETTY_FUNCTION__, __LINE__);
-
-    switch (new_state)
-    {
-    case ubuntu::application::ui::process_running:
-    {
-        if (as->running_state == ubuntu::application::ui::process_running)
-        {
-            ALOGI("%s():%d running->running", __PRETTY_FUNCTION__, __LINE__);
-            /* FIXME:
-             * Technically invalid, this transition currently is hit because
-             * of focus being requested on the session before its delagate call
-             */
-        } else if (as->running_state == ubuntu::application::ui::process_destroyed)
-        {
-            ALOGI("%s():%d destroyed->running", __PRETTY_FUNCTION__, __LINE__);
-            /* TODO:
-             * Resume application with a null archive handler
-             */
-        } else if (as->running_state == ubuntu::application::ui::process_stopped)
-        {
-            ALOGI("%s():%d stopped->running", __PRETTY_FUNCTION__, __LINE__);
-            /* TODO:
-             * Support starting the new process and wait for the
-             * session to be available to call its delegate
-             */
-            return;
-        } else
-        {
-            /* suspended->running
-             * nothing to do, process image still in memory
-             */
-            if (app_manager_task_controller != NULL)
-                app_manager_task_controller->continue_task(as->remote_pid);
-            else
-                kill(as->pid, SIGCONT);
-        }
-        as->running_state = ubuntu::application::ui::process_running;
-        as->on_application_resumed();
-        update_oom_values(as);
-    }
-    break;
-    case ubuntu::application::ui::process_suspended:
-    {
-        ALOGI("%s() state->suspended", __PRETTY_FUNCTION__);
-        /* TODO: create archive */
-        as->on_application_about_to_stop();
-        as->running_state = ubuntu::application::ui::process_suspended;
-        android::sp<android::Thread> deferred_kill(new ubuntu::application::ProcessKiller(as, app_manager_task_controller));
-        deferred_kill->run();
-        update_oom_values(as);
-    }
-    break;
-    case ubuntu::application::ui::process_stopped:
-    {
-        ALOGI("%s() state->stopped", __PRETTY_FUNCTION__);
-        /* TODO:
-         * This transition occurs while SIGSTOP'd. Check we hold a valid archive
-         * and then destroy the process image. No need to signal via delegates.
-         */
-        as->running_state = ubuntu::application::ui::process_stopped;
-    }
-    break;
-    case ubuntu::application::ui::process_destroyed:
-    {
-        ALOGI("%s() state->destroyed", __PRETTY_FUNCTION__);
-        /* TODO:
-         * Internal transition: Invalidate archive if any, destroy
-         * process image.
-         */
-        as->running_state = ubuntu::application::ui::process_destroyed;
-    }
-    break;
-    }
-}
-
-void ApplicationManager::start_a_new_session(
-    int32_t session_type,
-    int32_t stage_hint,
-    const android::String8& app_name,
-    const android::String8& desktop_file,
-    const android::sp<android::IApplicationManagerSession>& session,
-    int fd,
-    uint32_t remote_pid)
-{
-    android::Mutex::Autolock al(guard);
-    (void) session_type;
-    pid_t pid = android::IPCThreadState::self()->getCallingPid();
-
-    pid_t rpid;
-    if (!remote_pid)
-    {
-        ALOGI("%s() no remote_pid set from client, lookup in proc", __PRETTY_FUNCTION__);
-        rpid = pid_to_vpid(pid);
-    }
-    else
-    {
-        ALOGI("%s() remote_pid=%d", __PRETTY_FUNCTION__, remote_pid);
-        rpid = static_cast<pid_t>(remote_pid);
-    }
-    
-    ALOGI("%s() starting new session pid=%d rpid=%d", __PRETTY_FUNCTION__, pid, rpid);
-    
-    android::sp<ubuntu::detail::ApplicationSession> app_session(
-        new ubuntu::detail::ApplicationSession(
-            pid,
-            rpid,
-            session,
-            session_type,
-            stage_hint,
-            app_name,
-            desktop_file));
-
-    apps.add(session->asBinder(), app_session);
-    apps_as_added.push_back(session->asBinder());
-
-    session->asBinder()->linkToDeath(
-        android::sp<android::IBinder::DeathRecipient>(this));
-
-    switch(session_type)
-    {
-        case ubuntu::application::ui::user_session_type:
-            ALOGI("%s: Invoked for user_session_type \n", __PRETTY_FUNCTION__);
-            break;
-        case ubuntu::application::ui::system_session_type:
-            ALOGI("%s: Invoked for system_session_type \n", __PRETTY_FUNCTION__);
-            break;
-    }
-
-    notify_observers_about_session_born(app_session->remote_pid, 
-                                        app_session->stage_hint, 
-                                        app_session->desktop_file);
-    
-    ALOGI("%s():%d session", __PRETTY_FUNCTION__, __LINE__);
-}
-
-void ApplicationManager::register_a_surface(
-    const android::String8& title,
-    const android::sp<android::IApplicationManagerSession>& session,
-    int32_t surface_role,
-    int32_t token,
-    int fd)
-{
-    android::Mutex::Autolock al(guard);
-    android::sp<android::InputChannel> input_channel(
-        new android::InputChannel(
-            title,
-            dup(fd)));
-
-    android::sp<ubuntu::detail::ApplicationSession::Surface> surface(
-        new ubuntu::detail::ApplicationSession::Surface(
-            apps.valueFor(session->asBinder()).get(),
-            input_channel,
-            surface_role,
-            token));
-
-    auto registered_session = apps.valueFor(session->asBinder());
-
-    ALOGI("Registering input channel as observer: %s",
-         registered_session->session_type == ubuntu::application::ui::system_session_type ? "true" : "false");
-
-    input_setup->input_manager->getDispatcher()->registerInputChannel(
-        surface->input_channel,
-        surface->make_input_window_handle(),
-        registered_session->session_type == ubuntu::application::ui::system_session_type);
-
-    registered_session->register_surface(surface);
-
-    if (registered_session->session_type == ubuntu::application::ui::system_session_type)
-    {
-        ALOGI("New surface for system session, adjusting layer now.");
-        switch(surface_role)
-        {
-            case ubuntu::application::ui::dash_actor_role:
-                registered_session->raise_surface_to_layer(token, default_dash_layer);
-                break;
-            case ubuntu::application::ui::indicator_actor_role:
-                registered_session->raise_surface_to_layer(token, default_indicator_layer);
-                break;
-            case ubuntu::application::ui::notifications_actor_role:
-                registered_session->raise_surface_to_layer(token, default_notifications_layer);
-                break;
-            case ubuntu::application::ui::greeter_actor_role:
-                registered_session->raise_surface_to_layer(token, default_greeter_layer);
-                break;
-            case ubuntu::application::ui::launcher_actor_role:
-                registered_session->raise_surface_to_layer(token, default_launcher_layer);
-                break;
-            case ubuntu::application::ui::on_screen_keyboard_actor_role:
-                registered_session->raise_surface_to_layer(token, default_osk_layer);
-                break;
-            case ubuntu::application::ui::shutdown_dialog_actor_role:
-                registered_session->raise_surface_to_layer(token, default_shutdown_dialog_layer);
-                break;
-        }
-    } 
-}
-
-void ApplicationManager::request_fullscreen(const android::sp<android::IApplicationManagerSession>& session)
-{
-    ALOGI("%s", __PRETTY_FUNCTION__);
-    android::Mutex::Autolock al(guard);
-
-    const android::sp<ubuntu::detail::ApplicationSession>& as =
-            apps.valueFor(session->asBinder());
-
-    notify_observers_about_session_requested_fullscreen(
-        as->remote_pid,
-        as->stage_hint,
-        as->desktop_file);
-}
-
-int ApplicationManager::get_session_pid(const android::sp<android::IApplicationManagerSession>& session)
-{
-    ALOGI("%s", __PRETTY_FUNCTION__);
-    android::Mutex::Autolock al(guard);
-
-    if (apps.indexOfKey(session->asBinder()) == android::NAME_NOT_FOUND)
-        return 0;
-
-    const android::sp<ubuntu::detail::ApplicationSession>& as =
-            apps.valueFor(session->asBinder());
-
-    return as->remote_pid;
-}
-
-void ApplicationManager::request_update_for_session(const android::sp<android::IApplicationManagerSession>& session)
-{
-    ALOGI("%s", __PRETTY_FUNCTION__);
-    android::Mutex::Autolock al(guard);
-
-    if (apps_as_added[focused_application] != session->asBinder())
-        return;
-
-    const android::sp<ubuntu::detail::ApplicationSession>& as =
-            apps.valueFor(apps_as_added[focused_application]);
-
-    if (as->session_type == ubuntu::application::ui::system_session_type)
-    {
-        input_setup->input_manager->getDispatcher()->setFocusedApplication(
-            shell_input_setup->shell_application);
-        android::Vector< android::sp<android::InputWindowHandle> > input_windows;
-        input_windows.push(shell_input_setup->event_trap_window.input_window);
-        input_setup->input_manager->getDispatcher()->setInputWindows(
-            input_windows);
-    } else
-    {
-        input_setup->input_manager->getDispatcher()->setFocusedApplication(
-            as->input_application_handle());
-
-        android::Vector< android::sp<android::InputWindowHandle> > input_windows;
-
-        if (is_osk_visible)
-            input_windows.push(shell_input_setup->osk_window.input_window);
-        if (are_notifications_visible)
-            input_windows.push(shell_input_setup->notifications_window.input_window);
-        
-        if (!shell_input_setup->trap_windows.isEmpty())
-        {
-            int key = 0;
-            for (size_t i = 0; i < shell_input_setup->trap_windows.size(); i++)
-            {
-                key = shell_input_setup->trap_windows.keyAt(i);
-                input_windows.push(shell_input_setup->trap_windows.valueFor(key));
-            }
-        }     
-
-        input_windows.appendVector(as->input_window_handles());
-
-        if (as->stage_hint == ubuntu::application::ui::side_stage)
-        {
-            const android::sp<ubuntu::detail::ApplicationSession>& main_session =
-                apps.valueFor(apps_as_added[main_stage_application]);
-            input_windows.appendVector(main_session->input_window_handles());
-        }
-
-        input_setup->input_manager->getDispatcher()->setInputWindows(
-            input_windows);
-    }
-}
-
-void ApplicationManager::register_task_controller(
-    const android::sp<android::IAMTaskController>& controller)
-{
-    ALOGI("%s() registering task controller", __PRETTY_FUNCTION__);
-
-    //TODO: Register the task controller to use it instead of sigkilling
-    android::Mutex::Autolock al(guard);
-
-    if (app_manager_task_controller != NULL)
-        return;
-
-    ALOGI("%s() done registering task controller", __PRETTY_FUNCTION__);
-    
-    app_manager_task_controller = controller;
-}
-
-void ApplicationManager::register_an_observer(
-    const android::sp<android::IApplicationManagerObserver>& observer)
-{
-    android::Mutex::Autolock al(observer_guard);
-    app_manager_observers.push_back(observer);
-    {
-        android::Mutex::Autolock al(guard);
-
-        for(unsigned int i = 0; i < apps_as_added.size(); i++)
-        {
-            const android::sp<ubuntu::detail::ApplicationSession>& session =
-                    apps.valueFor(apps_as_added[i]);
-
-            observer->on_session_born(session->remote_pid,
-                                      session->stage_hint,
-                                      session->desktop_file);
-        }
-
-        if (focused_application < apps_as_added.size())
-        {
-            const android::sp<ubuntu::detail::ApplicationSession>& session =
-                    apps.valueFor(apps_as_added[focused_application]);
-
-            observer->on_session_focused(session->remote_pid,
-                                         session->stage_hint,
-                                         session->desktop_file);
-        }
-    }
-}
-
-void ApplicationManager::focus_running_session_with_id(int id)
-{
-    android::Mutex::Autolock al(guard);
-
-    size_t idx = session_id_to_index(id);
-
-    if (idx < apps_as_added.size())
-    {
-        switch_focused_application_locked(idx);
-    }
-}
-
-void ApplicationManager::unfocus_running_sessions()
-{
-    ALOGI("%s", __PRETTY_FUNCTION__);
-    
-    android::Mutex::Autolock al(guard);
-
-    if (shell_input_setup->shell_has_focus)
-        return;
-
-    input_setup->input_manager->getDispatcher()->setFocusedApplication(
-        shell_input_setup->shell_application);
-    android::Vector< android::sp<android::InputWindowHandle> > input_windows;
-        input_windows.push(shell_input_setup->event_trap_window.input_window);
-    input_setup->input_manager->getDispatcher()->setInputWindows(
-        input_windows);
-
-    if (focused_application < apps.size())
-    {
-        const android::sp<ubuntu::detail::ApplicationSession>& session =
-                apps.valueFor(apps_as_added[focused_application]);
-        
-        if (session->session_type != ubuntu::application::ui::system_session_type)
-        {          
-            notify_observers_about_session_unfocused(session->remote_pid,
-                                                     session->stage_hint,
-                                                     session->desktop_file);
-
-            if (!is_session_allowed_to_run_in_background(session))
-                session_set_state(session, ubuntu::application::ui::process_suspended);
-        }
-    }
-    shell_input_setup->shell_has_focus = true;
-}
-
-int32_t ApplicationManager::query_snapshot_layer_for_session_with_id(int id)
-{
-    size_t idx = session_id_to_index(id);
-
-    if (idx < apps_as_added.size())
-    {
-        return apps.valueFor(apps_as_added[idx])->layer();
-    }
-
-    return INT_MAX;
-}
-
-android::IApplicationManagerSession::SurfaceProperties ApplicationManager::query_surface_properties_for_session_id(int id)
-{
-    android::Mutex::Autolock al(guard);
-    
-    size_t idx = session_id_to_index(id);
-    android::IApplicationManagerSession::SurfaceProperties props;
-    int status;
-
-    if (idx < apps_as_added.size())
-    {
-        const android::sp<ubuntu::detail::ApplicationSession>& session =
-                apps.valueFor(apps_as_added[idx]);
-
-        if (session->running_state == ubuntu::application::ui::process_suspended)
-        {
-            kill(session->pid, SIGCONT);
-            props = session->query_properties();
-            kill(session->pid, SIGSTOP);
-        } else {
-            props = session->query_properties();
-        }
-
-        return props;
-    }
-    
-    return android::IApplicationManagerSession::SurfaceProperties();
-}
-
-void ApplicationManager::switch_to_well_known_application(int32_t app)
-{
-    notify_observers_about_session_requested(app);
-}
-
-int32_t ApplicationManager::set_surface_trap(int x, int y, int width, int height)
-{
-    static int32_t key = 0;
-
-    ApplicationManager::ShellInputSetup::Window<0, 0, 2048, 2048>* w =
-        new ApplicationManager::ShellInputSetup::Window<0, 0, 2048, 2048>(shell_input_setup.get(), x, y, width, height);
-
-    key++; 
-    shell_input_setup->trap_windows.add(key, w->input_window);
-
-    update_input_setup_locked();
-
-    return key;
-}
-
-void ApplicationManager::unset_surface_trap(int32_t handle)
-{
-    shell_input_setup->trap_windows.removeItem(handle);
-
-    update_input_setup_locked();
-}
-
-void ApplicationManager::report_osk_visible(int32_t x, int32_t y, int32_t width, int32_t height)
-{
-    ALOGI("%s(x=%d, y=%d, width=%d, height=%d)", __PRETTY_FUNCTION__, x, y, width, height);
-    
-    shell_input_setup->osk_window.input_window->x = x;
-    shell_input_setup->osk_window.input_window->y = y;   
-    shell_input_setup->osk_window.input_window->w = width;
-    shell_input_setup->osk_window.input_window->h = height;
-
-    android::Mutex::Autolock al(guard);
-    is_osk_visible = true;
-
-    update_input_setup_locked();
-
-    notify_observers_about_keyboard_geometry_changed(x, y, width, height);
-}
-
-void ApplicationManager::report_osk_invisible()
-{
-    ALOGI("%s", __PRETTY_FUNCTION__);
-    android::Mutex::Autolock al(guard);
-    is_osk_visible = false;
-
-    update_input_setup_locked();
-
-    notify_observers_about_keyboard_geometry_changed(0, 0, 0, 0);
-}
-
-void ApplicationManager::report_notification_visible()
-{
-    ALOGI("%s", __PRETTY_FUNCTION__);
-    android::Mutex::Autolock al(guard);
-    are_notifications_visible = true;
-
-    update_input_setup_locked();
-}
-
-void ApplicationManager::report_notification_invisible()
-{
-    ALOGI("%s", __PRETTY_FUNCTION__);
-    android::Mutex::Autolock al(guard);
-    are_notifications_visible = false;
-
-    update_input_setup_locked();
-}
-
-void ApplicationManager::update_input_setup_locked()
-{
-    if (focused_application >= apps.size())
-        return;
-    
-    const android::sp<ubuntu::detail::ApplicationSession>& session =
-            apps.valueFor(apps_as_added[focused_application]);
-    
-    if (shell_input_setup->shell_has_focus)
-    {
-        input_setup->input_manager->getDispatcher()->setFocusedApplication(
-            shell_input_setup->shell_application);
-        
-        android::Vector< android::sp<android::InputWindowHandle> > input_windows;
-        input_windows.push(shell_input_setup->event_trap_window.input_window);
-
-        input_setup->input_manager->getDispatcher()->setInputWindows(
-            input_windows);
-    } else
-    {
-        ALOGI("Adjusting input setup to account for change in visibility of osk/notifications");
-
-        input_setup->input_manager->getDispatcher()->setFocusedApplication(
-            session->input_application_handle());
-        
-        android::Vector< android::sp<android::InputWindowHandle> > input_windows;
-        if (is_osk_visible)
-            input_windows.push(shell_input_setup->osk_window.input_window);
-        if (are_notifications_visible)
-            input_windows.push(shell_input_setup->notifications_window.input_window);
-        if (!shell_input_setup->trap_windows.isEmpty())
-        {
-            int key = 0;
-            for (size_t i = 0; i < shell_input_setup->trap_windows.size(); i++)
-            {
-                key = shell_input_setup->trap_windows.keyAt(i);
-                input_windows.push(shell_input_setup->trap_windows.valueFor(key));
-            }
-        }
-   
-        android::sp<android::IBinder> sb = apps_as_added[focused_application];
-    
-        if (sb->isBinderAlive())
-            input_windows.appendVector(session->input_window_handles());
-
-        if (session->stage_hint == ubuntu::application::ui::side_stage)
-        {
-            const android::sp<ubuntu::detail::ApplicationSession>& main_session =
-                apps.valueFor(apps_as_added[main_stage_application]);
-
-            android::sp<android::IBinder> msb = apps_as_added[focused_application];
-            if (msb->isBinderAlive())
-            {
-                input_windows.appendVector(main_session->input_window_handles());
-            }
-        }
-
-        input_setup->input_manager->getDispatcher()->setInputWindows(
-            input_windows);
-    }
-}
-
-void ApplicationManager::switch_focused_application_locked(size_t index_of_next_focused_app)
-{
-    static int focused_layer = 0;
-    static const int focused_layer_increment = 10;
-
-    if (apps.size() > 1 &&
-        focused_application < apps.size() &&
-        focused_application < apps_as_added.size() &&
-        focused_application != index_of_next_focused_app)
-    {
-        ALOGI("Lowering current application now for idx: %d \n", focused_application);
-        const android::sp<ubuntu::detail::ApplicationSession>& session =
-                apps.valueFor(apps_as_added[focused_application]);
- 
-        const android::sp<ubuntu::detail::ApplicationSession>& next_session =
-                apps.valueFor(apps_as_added[index_of_next_focused_app]);
-       
-        if (next_session->session_type == ubuntu::application::ui::system_session_type)
-            return;
-        
-        if (session->session_type != ubuntu::application::ui::system_session_type)
-        {
-            // Stop the session
-            if (!is_session_allowed_to_run_in_background(session))
-            {
-                if ((session->stage_hint == ubuntu::application::ui::main_stage &&
-                    next_session->stage_hint != ubuntu::application::ui::side_stage) ||
-                    (session->stage_hint == ubuntu::application::ui::side_stage &&
-                    next_session->stage_hint != ubuntu::application::ui::main_stage))
-                {
-                    notify_observers_about_session_unfocused(session->remote_pid,
-                                                             session->stage_hint,
-                                                             session->desktop_file);
-
-                    session_set_state(session, ubuntu::application::ui::process_suspended);
-                } else
-                {
-                    if (session->stage_hint == ubuntu::application::ui::side_stage &&
-                        next_session->stage_hint == ubuntu::application::ui::main_stage &&
-                        main_stage_application < apps.size())
-                    {
-                        const android::sp<ubuntu::detail::ApplicationSession>& main_session =
-                            apps.valueFor(apps_as_added[main_stage_application]);
-
-                        if (main_session->session_type != ubuntu::application::ui::system_session_type)
-                            session_set_state(main_session, ubuntu::application::ui::process_suspended);
-                    }
-                }
-            }
-        }
-    }
-
-    focused_application = index_of_next_focused_app;
-    is_osk_visible = false;
-    notify_observers_about_keyboard_geometry_changed(0, 0, 0, 0);
-
-    if (focused_application < apps.size())
-    {
-          
-        focused_layer += focused_layer_increment;
-
-        const android::sp<ubuntu::detail::ApplicationSession>& session =
-                apps.valueFor(apps_as_added[focused_application]);
-
-        ALOGI("Raising application now for idx: %d (stage_hint: %d)\n", focused_application, session->stage_hint);
-
-        if (session->session_type == ubuntu::application::ui::system_session_type)
-        {
-            ALOGI("\t system session - not raising it.");
-            return;
-        }
-
-        // Continue the session
-        if (!is_session_allowed_to_run_in_background(session))
-            session_set_state(session, ubuntu::application::ui::process_running);
-
-        if (session->stage_hint == ubuntu::application::ui::side_stage)
-            side_stage_application = focused_application;
-        else
-            main_stage_application = focused_application;
-        
-        session->raise_application_surfaces_to_layer(focused_layer);
-        input_setup->input_manager->getDispatcher()->setFocusedApplication(
-            session->input_application_handle());
-
-        android::Vector< android::sp<android::InputWindowHandle> > input_windows;
-
-        if (are_notifications_visible)
-            input_windows.push(shell_input_setup->notifications_window.input_window);
-        if (!shell_input_setup->trap_windows.isEmpty())
-        {
-            int key = 0;
-            for (size_t i = 0; i < shell_input_setup->trap_windows.size(); i++)
-            {
-                key = shell_input_setup->trap_windows.keyAt(i);
-                input_windows.push(shell_input_setup->trap_windows.valueFor(key));
-            }
-        }
-
-        input_windows.appendVector(session->input_window_handles());
-        
-        if (session->stage_hint == ubuntu::application::ui::side_stage)
-        {
-            if (main_stage_application)
-            {
-                const android::sp<ubuntu::detail::ApplicationSession>& main_session =
-                    apps.valueFor(apps_as_added[main_stage_application]);
-                session_set_state(main_session, ubuntu::application::ui::process_running);
-                input_windows.appendVector(main_session->input_window_handles());
-            }
-        }
-        
-        input_setup->input_manager->getDispatcher()->setInputWindows(
-            input_windows);
-
-        notify_observers_about_session_focused(session->remote_pid,
-                                               session->stage_hint,
-                                               session->desktop_file);
-
-        shell_input_setup->shell_has_focus = false;
-    }
-}
-
-void ApplicationManager::switch_focus_to_next_application_locked()
-{
-    size_t new_idx = (focused_application + 1) % apps.size();
-
-    ALOGI("current: %d, next: %d \n", focused_application, new_idx);
-
-    switch_focused_application_locked(new_idx);
-}
-
-void ApplicationManager::kill_focused_application_locked()
-{
-    if (focused_application < apps.size())
-    {
-        const android::sp<ubuntu::detail::ApplicationSession>& session =
-                apps.valueFor(apps_as_added[focused_application]);
-
-        kill(session->pid, SIGKILL);
-    }
-}
-
-size_t ApplicationManager::session_id_to_index(int id)
-{
-    size_t idx = 0;
-
-    for(idx = 0; idx < apps_as_added.size(); idx++)
-    {
-        const android::sp<ubuntu::detail::ApplicationSession>& session =
-                apps.valueFor(apps_as_added[idx]);
-
-        if (session->remote_pid == id)
-            break;
-    }
-
-    return idx;
-}
-
-void ApplicationManager::notify_observers_about_session_requested(uint32_t app)
-{
-    android::Mutex::Autolock al(observer_guard);
-    for(unsigned int i = 0; i < app_manager_observers.size(); i++)
-    {
-        app_manager_observers[i]->on_session_requested(app);
-    }
-}
-
-void ApplicationManager::notify_observers_about_session_born(int id, int stage_hint, const android::String8& desktop_file)
-{
-    android::Mutex::Autolock al(observer_guard);
-    for(unsigned int i = 0; i < app_manager_observers.size(); i++)
-    {
-        app_manager_observers[i]->on_session_born(id, stage_hint, desktop_file);
-    }
-}
-
-void ApplicationManager::notify_observers_about_session_unfocused(int id, int stage_hint, const android::String8& desktop_file)
-{
-    android::Mutex::Autolock al(observer_guard);
-    for(unsigned int i = 0; i < app_manager_observers.size(); i++)
-    {
-        app_manager_observers[i]->on_session_unfocused(id, stage_hint, desktop_file);
-    }
-}
-
-void ApplicationManager::notify_observers_about_session_focused(int id, int stage_hint, const android::String8& desktop_file)
-{
-    android::Mutex::Autolock al(observer_guard);
-    for(unsigned int i = 0; i < app_manager_observers.size(); i++)
-    {
-        app_manager_observers[i]->on_session_focused(id, stage_hint, desktop_file);
-    }
-}
-
-void ApplicationManager::notify_observers_about_keyboard_geometry_changed(int x, int y, int width, int height)
-{
-    android::Mutex::Autolock al(observer_guard);
-    for(unsigned int i = 0; i < app_manager_observers.size(); i++)
-    {
-        app_manager_observers[i]->on_keyboard_geometry_changed(x, y, width, height);
-    }
-}
-
-void ApplicationManager::notify_observers_about_session_requested_fullscreen(int id, int stage_hint, const android::String8& desktop_file)
-{
-    android::Mutex::Autolock al(observer_guard);
-    for(unsigned int i = 0; i < app_manager_observers.size(); i++)
-    {
-        app_manager_observers[i]->on_session_requested_fullscreen(id, stage_hint, desktop_file);
-    }
-}
-
-void ApplicationManager::notify_observers_about_session_died(int id, int stage_hint, const android::String8& desktop_file)
-{
-    android::Mutex::Autolock al(observer_guard);
-    for(unsigned int i = 0; i < app_manager_observers.size(); i++)
-    {
-        app_manager_observers[i]->on_session_died(id, stage_hint, desktop_file);
-    }
-}
-
-struct ClipboardService : public android::BnClipboardService
-{
-    void set_content(const android::IClipboardService::Content& content)
-    {
-        this->content = content;
-    }
-
-    void get_content(android::IClipboardService::Content& content)
-    {
-        content = this->content;
-    }
-
-    android::IClipboardService::Content content;
-};
-
-}
-}
-int main(int argc, char** argv)
-{
-    android::sp<ubuntu::detail::ApplicationManager> app_manager(new ubuntu::detail::ApplicationManager());
-    android::sp<ubuntu::detail::ClipboardService> clipboard_service(new ubuntu::detail::ClipboardService());
-    // Register service
-    android::sp<android::IServiceManager> service_manager = android::defaultServiceManager();
-    if (android::NO_ERROR != service_manager->addService(
-            android::String16(android::IApplicationManager::exported_service_name()),
-            app_manager))
-    {
-        return EXIT_FAILURE;
-    }
-
-    if (android::NO_ERROR != service_manager->addService(
-            android::String16(android::IClipboardService::exported_service_name()),
-            clipboard_service))
-    {
-        return EXIT_FAILURE;
-    }
-
-    android::ProcessState::self()->startThreadPool();
-    android::IPCThreadState::self()->joinThreadPool();
-}

=== removed file 'android/hybris/default_application_manager.h'
--- android/hybris/default_application_manager.h	2014-01-22 05:28:18 +0000
+++ android/hybris/default_application_manager.h	1970-01-01 00:00:00 +0000
@@ -1,255 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef DEFAULT_APPLICATION_MANAGER_H_
-#define DEFAULT_APPLICATION_MANAGER_H_
-
-#include "application_manager.h"
-#include "default_application_manager_input_setup.h"
-#include "default_application_session.h"
-#include "event_loop.h"
-#include "lifecycle_helpers.h"
-
-#include <binder/IPCThreadState.h>
-#include <binder/IServiceManager.h>
-#include <binder/ProcessState.h>
-
-#include <input/InputListener.h>
-#include <input/InputReader.h>
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
-#include <androidfw/InputTransport.h>
-#else
-#include <input/InputTransport.h>
-#endif
-#include <utils/threads.h>
-
-namespace ubuntu { namespace detail
-{
-struct ApplicationManager : 
-            public android::BnApplicationManager,
-            public android::IBinder::DeathRecipient
-{
-    static const int default_shell_component_layer = 1000000;
-    
-    static const int default_dash_layer = default_shell_component_layer + 1;
-    static const int default_indicator_layer = default_shell_component_layer + 2;
-    static const int default_notifications_layer = default_shell_component_layer + 3;
-    static const int default_greeter_layer = default_shell_component_layer + 4;
-    static const int default_launcher_layer = default_shell_component_layer + 5;
-    static const int default_osk_layer = default_shell_component_layer + 6;
-    static const int default_shutdown_dialog_layer = default_shell_component_layer + 7;
-    
-    static const int focused_application_base_layer = 100;
-    static const int wallpaper_layer = 0;
-    static const int non_focused_application_layer = -1;
-
-    struct ShellInputSetup : public android::RefBase
-    {
-        struct DisplayInfo
-        {
-            DisplayInfo();
-
-            android::DisplayInfo info;
-        };
-
-        template<int x, int y, int w, int h>
-        struct Window : public android::RefBase
-        {
-            static int looper_callback(int receiveFd, int events, void* ctxt);
-
-            Window(ShellInputSetup* parent, 
-                   int _x = x,
-                   int _y = y,
-                   int _w = w,
-                   int _h = h);
-            
-            android::sp<android::InputSetup::DummyApplicationWindow> input_window;
-            
-            ShellInputSetup* parent;
-            android::sp<android::InputChannel> server_channel;
-            android::sp<android::InputChannel> client_channel;
-            android::InputConsumer input_consumer;
-            android::PreallocatedInputEventFactory event_factory;
-        };
-        
-        ShellInputSetup(const android::sp<android::InputManager>& input_manager);
-
-        bool shell_has_focus;
-    
-        DisplayInfo display_info;
-        
-        android::sp<android::InputManager> input_manager;
-        android::sp<android::InputApplicationHandle> shell_application;
-        
-        android::sp<android::Looper> looper;
-        ubuntu::application::EventLoop event_loop;
-
-        android::KeyedVector<int32_t,  android::sp<android::InputWindowHandle> > trap_windows;
-
-        // TODO(tvoss): Get rid of hard coded values.
-        Window<0, 0, 720, 1280> event_trap_window;
-        // TODO(tvoss): This is really hacky, but we need to
-        // synchronize/reflect state changes across multiple processes
-        // here, i.e.: 
-        //   * maliit-server, which takes care of hiding and showing the osk 
-        //   * notify-osd, which takes care of hiding and showing notifications
-        Window<0, 812, 720, 468> osk_window;
-        Window<36, 18, 684, 216> notifications_window;
-    };
-
-    class InputFilter : public android::InputFilter
-    {
-      public:
-        InputFilter(ApplicationManager* manager);
-
-        bool filter_event(const android::InputEvent* event);
-
-      private:
-        ApplicationManager* manager;
-
-        bool handle_key_event(const android::KeyEvent* event);
-    };
-
-    class LockingIterator : public android::RefBase
-    {
-      public:
-        void advance() ;
-
-        bool is_valid() const;
-
-        void make_current();
-
-        const android::sp<ubuntu::detail::ApplicationSession>& operator*();
-
-      protected:
-        friend class ApplicationManager;
-
-        LockingIterator(
-            ApplicationManager* manager,
-            size_t index);
-
-        virtual ~LockingIterator();
-
-      private:
-        ApplicationManager* manager;
-        size_t it;
-    };
-
-    ApplicationManager();
-
-    void update_app_lists();
-
-    // From DeathRecipient
-    void binderDied(const android::wp<android::IBinder>& who);
-
-    void lock();
-
-    void unlock();
-
-    android::sp<LockingIterator> iterator();
-
-    void session_set_state(const android::sp<ubuntu::detail::ApplicationSession>& session,
-                           int32_t new_state);
-
-    void start_a_new_session(
-        int32_t session_type,
-        int32_t stage_hint,
-        const android::String8& app_name,
-        const android::String8& desktop_file,
-        const android::sp<android::IApplicationManagerSession>& session,
-        int fd,
-        uint32_t remote_pid);
-
-    void register_a_surface(
-        const android::String8& title,
-        const android::sp<android::IApplicationManagerSession>& session,
-        int32_t surface_role,
-        int32_t token,
-        int fd);
-
-    void request_fullscreen(const android::sp<android::IApplicationManagerSession>& session);
-
-    void register_an_observer(const android::sp<android::IApplicationManagerObserver>& observer);
-    
-    void register_task_controller(const android::sp<android::IAMTaskController>& controller);
-
-    int get_session_pid(const android::sp<android::IApplicationManagerSession>& session);
-
-    void request_update_for_session(const android::sp<android::IApplicationManagerSession>& session);
-
-    void focus_running_session_with_id(int id);
-
-    void unfocus_running_sessions();
-
-    int32_t query_snapshot_layer_for_session_with_id(int id);
-
-    android::IApplicationManagerSession::SurfaceProperties query_surface_properties_for_session_id(int id);
-
-    void switch_to_well_known_application(int32_t app);
-
-    int32_t set_surface_trap(int32_t x, int32_t y, int32_t width, int32_t height);
-
-    void unset_surface_trap(int32_t handle);
-
-    void report_osk_visible(int32_t x, int32_t y, int32_t width, int32_t height);
-    
-    void report_osk_invisible();
-
-    void report_notification_visible();
-
-    void report_notification_invisible();
-
-    void switch_focused_application_locked(size_t index_of_next_focused_app);
-    void switch_focus_to_next_application_locked();
-
-    void kill_focused_application_locked();
-
-  private:
-    void update_input_setup_locked();
-
-    size_t session_id_to_index(int id);
-    void notify_observers_about_session_requested(uint32_t app);
-    void notify_observers_about_session_born(int id, int stage_hint, const android::String8& desktop_file);
-    void notify_observers_about_session_unfocused(int id, int stage_hint, const android::String8& desktop_file);
-    void notify_observers_about_session_focused(int id, int stage_hint, const android::String8& desktop_file);
-    void notify_observers_about_keyboard_geometry_changed(int x, int y, int width, int height);
-    void notify_observers_about_session_requested_fullscreen(int id, int stage_hint, const android::String8& desktop_file);
-    void notify_observers_about_session_died(int id, int stage_hint, const android::String8& desktop_file);
-
-    android::sp<android::InputListenerInterface> input_listener;
-    android::sp<InputFilter> input_filter;
-    android::sp<android::InputSetup> input_setup;
-    android::sp<ShellInputSetup> shell_input_setup;
-    bool is_osk_visible;
-    bool are_notifications_visible;
-    android::Condition state_cond;
-    android::Mutex state_lock;
-    android::Mutex guard;
-    android::KeyedVector< android::sp<android::IBinder>, android::sp<ubuntu::detail::ApplicationSession> > apps;
-    android::Vector< android::sp<android::IBinder> > apps_as_added;
-    android::Mutex observer_guard;
-    android::Vector< android::sp<android::IApplicationManagerObserver> > app_manager_observers;
-    android::sp<android::IAMTaskController> app_manager_task_controller;
-    size_t focused_application;    
-    size_t side_stage_application;
-    size_t main_stage_application;
-};
-
-}
-}
-
-#endif // DEFAULT_APPLICATION_MANAGER_H_

=== removed file 'android/hybris/default_application_manager_input_setup.h'
--- android/hybris/default_application_manager_input_setup.h	2014-01-22 05:28:18 +0000
+++ android/hybris/default_application_manager_input_setup.h	1970-01-01 00:00:00 +0000
@@ -1,452 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef DEFAULT_APPLICATION_MANAGER_INPUT_SETUP_H_
-#define DEFAULT_APPLICATION_MANAGER_INPUT_SETUP_H_
-
-#include <input/InputDispatcher.h>
-#include <input/InputListener.h>
-#include <input/InputManager.h>
-#include <input/InputReader.h>
-#include <input/PointerController.h>
-#include <input/SpriteController.h>
-#include <gui/ISurfaceComposer.h>
-#include <gui/SurfaceComposerClient.h>
-
-#include <cstdio>
-
-#define REPORT_FUNCTION_CALL()// printf("%s \n", __PRETTY_FUNCTION__);
-
-namespace android
-{
-class DefaultPointerControllerPolicy : public android::PointerControllerPolicyInterface
-{
-public:
-
-    static const size_t bitmap_width = 64;
-    static const size_t bitmap_height = 64;
-
-    DefaultPointerControllerPolicy()
-    {
-        bitmap.setConfig(
-            SkBitmap::kARGB_8888_Config,
-            bitmap_width,
-            bitmap_height);
-        bitmap.allocPixels();
-
-        // Icon for spot touches
-        bitmap.eraseARGB(125, 0, 255, 0);
-        spotTouchIcon = android::SpriteIcon(
-                            bitmap,
-                            bitmap_width/2,
-                            bitmap_height/2);
-        // Icon for anchor touches
-        bitmap.eraseARGB(125, 0, 0, 255);
-        spotAnchorIcon = android::SpriteIcon(
-                             bitmap,
-                             bitmap_width/2,
-                             bitmap_height/2);
-        // Icon for hovering touches
-        bitmap.eraseARGB(125, 255, 0, 0);
-        spotHoverIcon = android::SpriteIcon(
-                            bitmap,
-                            bitmap_width/2,
-                            bitmap_height/2);
-    }
-
-    void loadPointerResources(android::PointerResources* outResources)
-    {
-        outResources->spotHover = spotHoverIcon.copy();
-        outResources->spotTouch = spotTouchIcon.copy();
-        outResources->spotAnchor = spotAnchorIcon.copy();
-    }
-
-    android::SpriteIcon spotHoverIcon;
-    android::SpriteIcon spotTouchIcon;
-    android::SpriteIcon spotAnchorIcon;
-    SkBitmap bitmap;
-};
-
-class DefaultInputReaderPolicyInterface : public android::InputReaderPolicyInterface
-{
-public:
-    static const int32_t internal_display_id = android::ISurfaceComposer::eDisplayIdMain;
-    static const int32_t external_display_id = android::ISurfaceComposer::eDisplayIdHdmi;
-
-    DefaultInputReaderPolicyInterface(const android::sp<android::Looper>& looper)
-        : looper(looper),
-          default_layer_for_touch_point_visualization(INT_MAX)
-    {
-        default_configuration.showTouches = false;
-
-        auto display = android::SurfaceComposerClient::getBuiltInDisplay(
-            android::ISurfaceComposer::eDisplayIdMain);
-        android::DisplayInfo info;
-        android::SurfaceComposerClient::getDisplayInfo(
-            display,
-            &info);
-
-        android::DisplayViewport viewport;
-        viewport.setNonDisplayViewport(info.w, info.h);
-        viewport.displayId = android::ISurfaceComposer::eDisplayIdMain;
-        default_configuration.setDisplayInfo(
-            false, /* external */
-            viewport);
-
-    }
-
-    void getReaderConfiguration(android::InputReaderConfiguration* outConfig)
-    {
-        *outConfig = default_configuration;
-    }
-
-    android::sp<android::PointerControllerInterface> obtainPointerController(int32_t deviceId)
-    {
-        (void) deviceId;
-
-        android::sp<android::SpriteController> sprite_controller(
-            new android::SpriteController(
-                looper,
-                default_layer_for_touch_point_visualization));
-        android::sp<android::PointerController> pointer_controller(
-            new android::PointerController(
-                android::sp<DefaultPointerControllerPolicy>(new DefaultPointerControllerPolicy()),
-                looper,
-                sprite_controller));
-        pointer_controller->setPresentation(
-            android::PointerControllerInterface::PRESENTATION_SPOT);
-        int32_t w, h, o;
-        auto display = android::SurfaceComposerClient::getBuiltInDisplay(
-            android::ISurfaceComposer::eDisplayIdMain);
-        android::DisplayInfo info;
-        android::SurfaceComposerClient::getDisplayInfo(
-            display,
-            &info);
-
-        pointer_controller->setDisplayViewport(info.w, info.h, info.orientation);
-        return pointer_controller;
-    }
-
-    virtual void notifyInputDevicesChanged(const Vector<InputDeviceInfo>& inputDevices) {
-        mInputDevices = inputDevices;
-    }
-
-    virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor) {
-        return NULL;
-    }
-
-    virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier) {
-        return String8::empty();
-    }
-private:
-    android::sp<android::Looper> looper;
-    int default_layer_for_touch_point_visualization;
-    android::InputReaderConfiguration default_configuration;
-    Vector<InputDeviceInfo> mInputDevices;
-};
-
-class InputFilter : public android::RefBase
-{
-public:
-    virtual bool filter_event(const android::InputEvent* event) = 0;
-
-protected:
-    InputFilter() {}
-    virtual ~InputFilter() {}
-
-    InputFilter(const InputFilter&) = delete;
-    InputFilter& operator=(const InputFilter&) = delete;
-};
-
-class DefaultInputDispatcherPolicy : public InputDispatcherPolicyInterface
-{
-public:
-    DefaultInputDispatcherPolicy(const android::sp<InputFilter>& input_filter)
-        : input_filter(input_filter)
-    {
-    }
-
-    ~DefaultInputDispatcherPolicy()
-    {
-    }
-
-    void notifyConfigurationChanged(nsecs_t when)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) when;
-    }
-
-    nsecs_t notifyANR(const sp<InputApplicationHandle>& inputApplicationHandle,
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<4
-                      const sp<InputWindowHandle>& inputWindowHandle)
-#else
-                      const sp<InputWindowHandle>& inputWindowHandle,
-                      const android::String8& reason)
-#endif
-    {
-        REPORT_FUNCTION_CALL();
-        (void) inputApplicationHandle;
-        (void) inputWindowHandle;
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR>=4
-        (void) reason;
-#endif
-
-        return 0;
-    }
-
-    void notifyInputChannelBroken(const sp<InputWindowHandle>& inputWindowHandle)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) inputWindowHandle;
-    }
-
-    void getDispatcherConfiguration(InputDispatcherConfiguration* outConfig)
-    {
-        REPORT_FUNCTION_CALL();
-        static InputDispatcherConfiguration config;
-        //config.maxEventsPerSecond = INT_MAX;
-        *outConfig = config;
-    }
-
-    bool isKeyRepeatEnabled()
-    {
-        REPORT_FUNCTION_CALL();
-        return true;
-    }
-
-    bool filterInputEvent(const InputEvent* event, uint32_t policyFlags)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) event;
-        (void) policyFlags;
-        return input_filter->filter_event(event);
-    }
-
-    void interceptKeyBeforeQueueing(const KeyEvent* event, uint32_t& policyFlags)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) event;
-        policyFlags |= POLICY_FLAG_PASS_TO_USER;
-    }
-
-    void interceptMotionBeforeQueueing(nsecs_t when, uint32_t& policyFlags)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) when;
-        (void) policyFlags;
-        policyFlags |= POLICY_FLAG_PASS_TO_USER;
-    }
-
-    nsecs_t interceptKeyBeforeDispatching(
-        const sp<InputWindowHandle>& inputWindowHandle,
-        const KeyEvent* keyEvent,
-        uint32_t policyFlags)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) inputWindowHandle;
-        (void) keyEvent;
-        (void) policyFlags;
-
-        return 0;
-    }
-
-    bool dispatchUnhandledKey(
-        const sp<InputWindowHandle>& inputWindowHandle,
-        const KeyEvent* keyEvent,
-        uint32_t policyFlags,
-        KeyEvent* outFallbackKeyEvent)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) inputWindowHandle;
-        (void) keyEvent;
-        (void) policyFlags;
-        (void) outFallbackKeyEvent;
-        return false;
-    }
-
-    virtual void notifySwitch(
-        nsecs_t when,
-        uint32_t switchCode,
-        uint32_t switchValue,
-        uint32_t policyFlags)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) when;
-        (void) switchCode;
-        (void) switchValue;
-        (void) policyFlags;
-    }
-
-    void pokeUserActivity(nsecs_t eventTime, int32_t eventType)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) eventTime;
-        (void) eventType;
-    }
-
-    bool checkInjectEventsPermissionNonReentrant(
-        int32_t injectorPid,
-        int32_t injectorUid)
-    {
-        REPORT_FUNCTION_CALL();
-        (void) injectorPid;
-        (void) injectorUid;
-
-        return true;
-    }
-
-    android::sp<InputFilter> input_filter;
-};
-
-class LooperThread : public android::Thread
-{
-public:
-    static const int default_poll_timeout_ms = 500;
-
-    LooperThread(const android::sp<android::Looper>& looper) : looper(looper)
-    {
-    }
-
-private:
-    bool threadLoop()
-    {
-        if (ALOOPER_POLL_ERROR == looper->pollAll(default_poll_timeout_ms))
-            return false;
-        return true;
-    }
-
-    android::sp<android::Looper> looper;
-};
-
-struct InputSetup : public android::RefBase
-{
-    struct DummyApplication : public android::InputApplicationHandle
-    {
-        bool updateInfo()
-        {
-            ALOGI("%s", __PRETTY_FUNCTION__);
-            if (mInfo == NULL)
-            {
-                mInfo = new android::InputApplicationInfo();
-                mInfo->name = "Shell";
-                mInfo->dispatchingTimeout = INT_MAX;
-            }
-
-            return true;
-        }
-    };
-
-    struct DummyApplicationWindow : public android::InputWindowHandle
-    {
-        DummyApplicationWindow(
-            const android::sp<android::InputApplicationHandle>& app_handle,
-            int x = 0,
-            int y = 0,
-            int w = 720,
-            int h = 1280) 
-                : android::InputWindowHandle(app_handle),
-                  x(x),
-                  y(y),
-                  w(w),
-                  h(h)
-        {
-        }
-        
-        bool updateInfo()
-        {
-            ALOGI("%s", __PRETTY_FUNCTION__);
-            if (mInfo == NULL)
-            {
-                mInfo = new android::InputWindowInfo();
-                SkRegion touchable_region;
-                touchable_region.setRect(x, y, x+w, y+h);
-                
-                mInfo->name = "ShellInputWindow";
-                mInfo->layoutParamsFlags = android::InputWindowInfo::FLAG_NOT_TOUCH_MODAL | android::InputWindowInfo::FLAG_SPLIT_TOUCH;
-                mInfo->layoutParamsType = android::InputWindowInfo::TYPE_APPLICATION;
-                mInfo->touchableRegion = touchable_region;
-                mInfo->frameLeft = x;
-                mInfo->frameTop = y;
-                mInfo->frameRight = x + w;
-                mInfo->frameBottom = y + h;
-                mInfo->scaleFactor = 1.f;
-                mInfo->visible = true;
-                mInfo->canReceiveKeys = true;
-                mInfo->hasFocus = true;
-                mInfo->hasWallpaper = false;
-                mInfo->paused = false;
-                mInfo->layer = 0;
-                mInfo->dispatchingTimeout = INT_MAX;
-                mInfo->ownerPid = 0;
-                mInfo->ownerUid = 0;
-                mInfo->inputFeatures = 0;
-                mInfo->inputChannel = input_channel;            
-            }
-
-            return true;
-        }
-
-        android::sp<android::InputChannel> input_channel;
-        int x;
-        int y;
-        int w;
-        int h;
-    };
-
-    InputSetup(const android::sp<InputFilter>& input_filter)
-        : looper(new android::Looper(false)),
-          looper_thread(new LooperThread(looper)),
-          event_hub(new android::EventHub()),
-          input_reader_policy(new DefaultInputReaderPolicyInterface(looper)),
-          input_dispatcher_policy(new DefaultInputDispatcherPolicy(input_filter)),
-          input_manager(new InputManager(event_hub, input_reader_policy, input_dispatcher_policy))
-    {
-        input_manager->getDispatcher()->setInputFilterEnabled(true);
-    }
-
-    void start()
-    {
-        input_manager->start();
-        looper_thread->run(__PRETTY_FUNCTION__,
-                           android::PRIORITY_URGENT_DISPLAY);
-    }
-
-    void stop()
-    {
-        input_manager->stop();
-        looper_thread->requestExitAndWait();
-    }
-
-    ~InputSetup()
-    {
-        stop();
-    }
-    android::sp<android::Looper> looper;
-    android::sp<LooperThread> looper_thread;
-
-    android::sp<android::EventHubInterface> event_hub;
-    android::sp<android::InputReaderPolicyInterface> input_reader_policy;
-    android::sp<android::InputDispatcherPolicyInterface> input_dispatcher_policy;
-    android::sp<android::InputManager> input_manager;
-
-    android::Condition wait_condition;
-    android::Mutex wait_guard;
-};
-
-}
-
-#endif // DEFAULT_APPLICATION_MANAGER_INPUT_SETUP_H_

=== removed file 'android/hybris/default_application_manager_test.cpp'
--- android/hybris/default_application_manager_test.cpp	2013-07-25 19:50:52 +0000
+++ android/hybris/default_application_manager_test.cpp	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#include "application_manager.h"
-
-#include <binder/IPCThreadState.h>
-#include <binder/IServiceManager.h>
-#include <binder/ProcessState.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-namespace
-{
-struct ApplicationManagerSession : public android::BnApplicationManagerSession
-{
-    ApplicationManagerSession()
-    {
-    }
-
-    void on_application_resumed()
-    {
-        printf("%s \n", __PRETTY_FUNCTION__);
-    }
-
-    void on_application_about_to_stop()
-    {
-        printf("%s \n", __PRETTY_FUNCTION__);
-    }
-
-    void raise_application_surfaces_to_layer(int layer)
-    {
-        printf("%s \n", __PRETTY_FUNCTION__);
-        printf("%d \n", layer);
-    }
-
-    void raise_surface_to_layer(int32_t token, int layer)
-    {
-        printf("%s: %d, %d \n", __PRETTY_FUNCTION__, token, layer);
-    }
-
-    SurfaceProperties query_surface_properties_for_token(int32_t token)
-    {
-        static const int layer = 100;
-        SurfaceProperties props = { layer, 0, 0, 960, 1280 };
-        return props;
-    }
-};
-
-struct ApplicationManagerObserver : public android::BnApplicationManagerObserver
-{
-    void on_session_requested(uint32_t app)
-    {
-        printf("%s: %d \n", __PRETTY_FUNCTION__, app);
-    }
-
-    void on_session_born(int id,
-                         int stage_hint,
-                         const android::String8& desktop_file)
-    {
-        printf("%s: %d, %d, %s \n", __PRETTY_FUNCTION__, id, stage_hint, desktop_file.string());
-    }
-
-    void on_session_unfocused(int id,
-                              int stage_hint,
-                              const android::String8& desktop_file)
-    {
-        printf("%s: %d, %d, %s \n", __PRETTY_FUNCTION__, id, stage_hint, desktop_file.string());
-    }
-
-    void on_session_focused(int id,
-                            int stage_hint,
-                            const android::String8& desktop_file)
-    {
-        printf("%s: %d, %d, %s \n", __PRETTY_FUNCTION__, id, stage_hint, desktop_file.string());
-    }
-
-    void on_keyboard_geometry_changed(int x,
-                                      int y,
-                                      int width,
-                                      int height)
-    {
-        printf("%s: %d, %d, %d, %d \n", __PRETTY_FUNCTION__, x, y, width, height);
-    }
-
-    void on_session_requested_fullscreen(int id,
-                                         int stage_hint,
-                                         const android::String8& desktop_file)
-    {
-        printf("%s: %d, %s \n", __PRETTY_FUNCTION__, id, desktop_file.string());
-    }
-
-    void on_session_died(int id,
-                         int stage_hint,
-                         const android::String8& desktop_file)
-    {
-        printf("%s: %d, %d, %s \n", __PRETTY_FUNCTION__, id, stage_hint, desktop_file.string());
-    }
-};
-
-}
-
-int main(int argc, char** argv)
-{
-    android::ProcessState::self()->startThreadPool();
-
-    int test_fd = open("test.file", O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
-
-    android::sp<ApplicationManagerObserver> observer(new ApplicationManagerObserver());
-    android::sp<ApplicationManagerSession> session(new ApplicationManagerSession());
-    android::sp<android::IServiceManager> service_manager = android::defaultServiceManager();
-    android::sp<android::IBinder> service = service_manager->getService(
-            android::String16(android::IApplicationManager::exported_service_name()));
-    android::BpApplicationManager app_manager(service);
-
-    app_manager.register_an_observer(observer);
-
-    static const int32_t session_type = 0;
-    static const int32_t stage_hint = 0;
-    
-    app_manager.start_a_new_session(
-        session_type,
-        stage_hint,
-        android::String8("default_application_manager_test"),
-        android::String8("default_application_manager_test"),
-        session,
-        test_fd,
-        0);
-
-    for(;;) {}
-}

=== removed file 'android/hybris/default_application_session.h'
--- android/hybris/default_application_session.h	2013-05-22 00:38:39 +0000
+++ android/hybris/default_application_session.h	1970-01-01 00:00:00 +0000
@@ -1,250 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef DEFAULT_APPLICATION_SESSION_H_
-#define DEFAULT_APPLICATION_SESSION_H_
-
-#include "application_manager.h"
-
-#include "private/application/ui/session_credentials.h"
-#include "private/application/ui/surface_role.h"
-#include "private/application/ui/stage_hint.h"
-
-#include <binder/IPCThreadState.h>
-#include <binder/IServiceManager.h>
-#include <binder/ProcessState.h>
-
-namespace ubuntu { namespace detail
-{
-
-struct ApplicationSession : public android::RefBase
-{
-    struct Surface : public android::RefBase
-    {
-        Surface(ApplicationSession* parent,
-                const android::sp<android::InputChannel>& input_channel,
-                int32_t surface_role,
-                int32_t token) 
-                : parent(parent),
-                  input_channel(input_channel),
-                  role(static_cast<ubuntu::application::ui::SurfaceRole>(surface_role)),
-                  token(token)
-        {
-        }
-
-        android::IApplicationManagerSession::SurfaceProperties query_properties()
-        {
-            android::IApplicationManagerSession::SurfaceProperties props =
-                parent->remote_session->query_surface_properties_for_token(token);
-
-            return props;
-        }
-
-        android::sp<android::InputWindowHandle> make_input_window_handle()
-        {
-            return android::sp<android::InputWindowHandle>(new InputWindowHandle(parent, android::sp<Surface>(this)));
-        }
-
-        ApplicationSession* parent;
-        android::sp<android::InputChannel> input_channel;
-        ubuntu::application::ui::SurfaceRole role;
-        int32_t token;
-    };
-
-    ApplicationSession(
-        pid_t pid,
-        pid_t remote_pid,
-        android::sp<android::IApplicationManagerSession> remote_session,
-        int32_t session_type,
-        int32_t stage_hint,
-        const android::String8& app_name,
-        const android::String8& desktop_file)
-            : running_state(ubuntu::application::ui::process_destroyed),
-            pid(pid),
-            remote_pid(remote_pid),
-            app_layer(0),
-            remote_session(remote_session),
-            session_type(static_cast<ubuntu::application::ui::SessionType>(session_type)),
-            stage_hint(stage_hint),
-            app_name(app_name),
-            desktop_file(desktop_file)
-    {
-    }
-
-    struct InputApplicationHandle : public android::InputApplicationHandle
-    {
-        InputApplicationHandle(ApplicationSession* parent) : parent(parent)
-        {
-            updateInfo();
-        }
-
-        bool updateInfo()
-        {
-            if (mInfo == NULL)
-            {
-                mInfo = new android::InputApplicationInfo();
-                mInfo->name = parent->app_name;
-                mInfo->dispatchingTimeout = INT_MAX;
-            }
-
-            return true;
-        }
-
-        ApplicationSession* parent;
-    };
-
-    struct InputWindowHandle : public android::InputWindowHandle
-    {
-        InputWindowHandle(ApplicationSession* parent, const android::sp<Surface>& surface)
-            : android::InputWindowHandle(
-                android::sp<InputApplicationHandle>(
-                    new InputApplicationHandle(parent))),
-            parent(parent),
-            surface(surface)
-        {
-            updateInfo();
-        }
-
-        bool updateInfo()
-        {
-            if (mInfo == NULL)
-            {
-                mInfo = new android::InputWindowInfo();
-            }
-            
-            android::IApplicationManagerSession::SurfaceProperties props;
-            if (parent->running_state == ubuntu::application::ui::process_suspended)
-            {
-                kill(parent->pid, SIGCONT);            
-                props = surface->query_properties();
-                kill(parent->pid, SIGSTOP);
-            } else
-                props = surface->query_properties();
-
-            ALOGI("%s: touchable_region = (%d, %d, %d, %d)", 
-                 __PRETTY_FUNCTION__,
-                 props.left, 
-                 props.top, 
-                 props.right, 
-                 props.bottom);
-            
-            SkRegion touchable_region;
-            touchable_region.setRect(props.left, props.top, props.right+1, props.bottom+1);
-            
-            mInfo->name = parent->app_name;
-            mInfo->layoutParamsFlags = android::InputWindowInfo::FLAG_NOT_TOUCH_MODAL;
-            mInfo->layoutParamsType = android::InputWindowInfo::TYPE_APPLICATION;
-            mInfo->touchableRegion = touchable_region;
-            mInfo->frameLeft = props.left;
-            mInfo->frameTop = props.top;
-            mInfo->frameRight = props.right+1;