Merge lp:~thomas-voss/platform-api/add_missing_agps_hooks into lp:platform-api

[Thomas Voß]

Added agps-specific functions to the gps subcomponent.

Added agps-specific functions to the gps subcomponent.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/platform-api-ci/193/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/27/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

187. By Thomas Voß on 2014-01-22

Remove uneccessary printf's.

186. By Thomas Voß on 2014-01-22

[ Martin Pitt ]
* Add backend for simulated sensor data.
[ Albert Astals ]
* Build fixes and typos.
[ Ricardo Mendoza ]
* Build fixes and typos.
[ Ubuntu daily release ]
* Automatic snapshot from revision 183

185. By Thomas Voß on 2014-01-22

Fix signature in bridge implementation.

184. By Thomas Voß on 2014-01-22

Revert accidental merge.

183. By Thomas Voß on 2014-01-21

* Added *_set_dimensions() function to the window properties.
[ Alexandros Frantzis ]
* mirclient: Initialize MirSurfaceParameters::output_id field.
[ Martin Pitt ]
* Fix all compiler warnings.
[ Timo Jyrinki ]
* bump debian version dependency for mir to 0.1.3 to force rebuild
[ Gerry Boland ]
* Fix FTBFS with Mir12 change - mir::geometry::PixelFormat was
  removed, using MirPixelFormat instead. (LP: #1266674)
[ Ubuntu daily release ]
* Automatic snapshot from revision 179

182. By Thomas Voß on 2013-12-19

Make sure that floating point values are transported correctly.

181. By Thomas Voß on 2013-12-16

Added deletion of GPS aiding data and supl server setup to test executable.

180. By Thomas Voß on 2013-12-16

Adjusted the command-line test executable for accessing the gps api.

179. By Thomas Voß on 2013-12-16

Compilation fixes.

178. By Thomas Voß on 2013-12-16

Added agps-specific functions to the gps subcomponent.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-05 14:58:09 +0000
+++ CMakeLists.txt	2014-01-22 16:11:40 +0000
@@ -93,9 +93,3 @@
 add_subdirectory(doc/)
 add_subdirectory(include/)
 add_subdirectory(src/)
-
-#### Enable tests
-include(CTest)
-set(GTEST_ROOT /usr/src/gtest)
-add_subdirectory(tests/)
-add_subdirectory(${GTEST_ROOT} ${CMAKE_CURRENT_BINARY_DIR}/gtest)

=== modified file 'android/default/default_ubuntu_application_ui.cpp'
--- android/default/default_ubuntu_application_ui.cpp	2013-12-11 06:11:34 +0000
+++ android/default/default_ubuntu_application_ui.cpp	2014-01-22 16:11:40 +0000
@@ -228,17 +228,6 @@
     p->value->set_input_event_cb_and_ctx(cb, ctx);
 }
 
-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
  */

=== modified file 'android/hybris/test_gps_api.cpp'
--- android/hybris/test_gps_api.cpp	2013-02-05 08:01:14 +0000
+++ android/hybris/test_gps_api.cpp	2014-01-22 16:11:40 +0000
@@ -17,6 +17,8 @@
  */
 #include <ubuntu/application/ubuntu_application_gps.h>
 
+#include <pthread.h>
+
 #include <ctime>
 #include <signal.h>
 #include <stdio.h>

=== modified file 'android/hybris/ubuntu_application_gps_for_hybris.cpp'
--- android/hybris/ubuntu_application_gps_for_hybris.cpp	2013-06-14 11:42:24 +0000
+++ android/hybris/ubuntu_application_gps_for_hybris.cpp	2014-01-22 16:11:40 +0000
@@ -18,6 +18,7 @@
 #include <ubuntu/hardware/gps.h>
 
 #include <pthread.h>
+#include <stdio.h>
 
 // android stuff
 #include <hardware/gps.h>
@@ -36,7 +37,15 @@
     bool stop();
     void inject_time(int64_t time, int64_t timeReference, int uncertainty);
     void inject_location(double latitude, double longitude, float accuracy);
-    void delete_aiding_data(uint16_t flags);
+    void delete_aiding_data(UHardwareGpsAidingData flags);
+
+    void set_server_for_type(UHardwareGpsAGpsType type, const char* hostname, uint16_t port);
+    void set_reference_location(UHardwareGpsAGpsRefLocation* location, size_t size_of_struct);
+
+    void notify_connection_is_open(const char* apn);
+    void notify_connection_is_closed();
+    void notify_connection_not_available();
+
     bool set_position_mode(uint32_t mode, uint32_t recurrence, uint32_t min_interval,
                            uint32_t preferred_accuracy, uint32_t preferred_time);
     void inject_xtra_data(char* data, int length);
@@ -84,6 +93,7 @@
 
 static void status_callback(GpsStatus* status)
 {
+    printf("%s \n", __PRETTY_FUNCTION__);
     if (!hybris_gps_instance)
         return;
 
@@ -135,7 +145,7 @@
 }
 
 
-typedef struct 
+typedef struct
 {
     void (*func)(void *);
     void *arg;
@@ -143,6 +153,7 @@
 
 static void * thread_start_wrapper(void* arg)
 {
+    printf("%s \n", __PRETTY_FUNCTION__);
     FuncAndArg *func_and_arg = reinterpret_cast<FuncAndArg*>(arg);
     func_and_arg->func(func_and_arg->arg);
     delete func_and_arg;
@@ -158,6 +169,7 @@
     func_and_arg->arg = arg;
 
     pthread_create(&thread, NULL, thread_start_wrapper, func_and_arg);
+    pthread_setname_np(thread, name);
     return thread;
 }
 
@@ -228,11 +240,14 @@
 static void agps_request_set_id(uint32_t flags)
 {
     if (hybris_gps_instance)
+    {
         hybris_gps_instance->request_setid_cb(flags, hybris_gps_instance->context);
+    }
 }
 
 static void agps_request_ref_location(uint32_t flags)
 {
+    printf("%s \n", __PRETTY_FUNCTION__);
     if (hybris_gps_instance)
         hybris_gps_instance->request_refloc_cb(flags, hybris_gps_instance->context);
 }
@@ -308,14 +323,52 @@
 
     // if XTRA initialization fails we will disable it by gps_Xtra_interface to null,
     // but continue to allow the rest of the GPS interface to work.
-    if (gps_xtra_interface && gps_xtra_interface->init(&gps_xtra_callbacks) != 0)
-        gps_xtra_interface = NULL;
+    if (gps_xtra_interface)
+    {
+        printf("Got GPS XTRA interface, trying to initialize ... \n");
+        if (gps_xtra_interface->init(&gps_xtra_callbacks) != 0)
+        {
+           printf("error\n");
+           gps_xtra_interface = NULL;
+        }
+        else
+        {
+            printf("success\n");
+
+        }
+    } else
+    {
+        printf("No GPS XTRA interface available from HAL.\n");
+    }
+
     if (agps_interface)
+    {
+        printf("Got AGPS interface, trying to initialize ...\n");
         agps_interface->init(&agps_callbacks);
+    } else
+    {
+        printf("No AGPS interface available from HAL.\n");
+    }
+
     if (gps_ni_interface)
+    {
+        printf("Got GPS NI interface, trying to initialize ...\n");
         gps_ni_interface->init(&gps_ni_callbacks);
+    }
+    else
+    {
+        printf("No GPS NI interface available from HAL.\n");
+    }
+
     if (agps_ril_interface)
+    {
+        printf("Got AGPS RIL interface, trying to initialize ...\n");
         agps_ril_interface->init(&agps_ril_callbacks);
+    }
+    else
+    {
+        printf("No AGPS RIL interface available from HAL.\n");
+    }
 
     return true;
 }
@@ -338,13 +391,16 @@
 
 void UHardwareGps_::inject_time(int64_t time, int64_t time_reference, int uncertainty)
 {
+    printf("%s: %p %d %d %d \n", __PRETTY_FUNCTION__, this, time, time_reference, uncertainty);
+
     if (gps_interface)
         gps_interface->inject_time(time, time_reference, uncertainty);
 }
 
 void UHardwareGps_::inject_location(double latitude, double longitude, float accuracy)
 {
-    if (gps_interface)
+    printf("%s: %p %f %f %f \n", __PRETTY_FUNCTION__, this, latitude, longitude, accuracy);
+    if (gps_interface && gps_interface->inject_location)
         gps_interface->inject_location(latitude, longitude, accuracy);
 }
 
@@ -354,9 +410,50 @@
         gps_interface->delete_aiding_data(flags);
 }
 
+void UHardwareGps_::set_server_for_type(UHardwareGpsAGpsType type, const char* hostname, uint16_t port)
+{
+    printf("%s \n", __PRETTY_FUNCTION__);
+    if (agps_interface)
+        agps_interface->set_server(type, hostname, port);
+}
+
+void UHardwareGps_::set_reference_location(UHardwareGpsAGpsRefLocation* location, size_t size_of_struct)
+{
+    AGpsRefLocation ref_loc;
+    ref_loc.type = location->type;
+    ref_loc.u.cellID.type = location->u.cellID.type;
+    ref_loc.u.cellID.mcc = location->u.cellID.mcc;
+    ref_loc.u.cellID.mnc = location->u.cellID.mnc;
+    ref_loc.u.cellID.lac = location->u.cellID.lac;
+    ref_loc.u.cellID.cid = location->u.cellID.cid;
+
+    if (agps_ril_interface)
+        agps_ril_interface->set_ref_location(&ref_loc, sizeof(ref_loc));
+}
+
+void UHardwareGps_::notify_connection_is_open(const char* apn)
+{
+    if (agps_interface)
+        agps_interface->data_conn_open(apn);
+}
+
+void UHardwareGps_::notify_connection_is_closed()
+{
+    if (agps_interface)
+        agps_interface->data_conn_closed();
+}
+
+void UHardwareGps_::notify_connection_not_available()
+{
+    if (agps_interface)
+        agps_interface->data_conn_failed();
+}
+
 bool UHardwareGps_::set_position_mode(uint32_t mode, uint32_t recurrence, uint32_t min_interval,
                                     uint32_t preferred_accuracy, uint32_t preferred_time)
 {
+    printf("%s \n", __PRETTY_FUNCTION__);
+
     if (gps_interface)
         return (gps_interface->set_position_mode(mode, recurrence, min_interval,
                                                  preferred_accuracy, preferred_time) == 0);
@@ -372,7 +469,8 @@
 
 /////////////////////////////////////////////////////////////////////
 // Implementation of the C API
-
+extern "C"
+{
 UHardwareGps u_hardware_gps_new(UHardwareGpsParams* params)
 {
     if (hybris_gps_instance != NULL)
@@ -416,14 +514,54 @@
 void u_hardware_gps_inject_location(UHardwareGps self, double latitude, double longitude,
                                 float accuracy)
 {
-    self->inject_location(latitude, longitude, accuracy);
+    printf("%s: %p %f %f %f \n", __PRETTY_FUNCTION__, hybris_gps_instance, latitude, longitude, accuracy);
+    if (self == NULL)
+        hybris_gps_instance->inject_location(latitude, longitude, accuracy);
+    else
+        self->inject_location(latitude, longitude, accuracy);
 }
 
-void u_hardware_gps_delete_aiding_data(UHardwareGps self, uint16_t flags)
+void u_hardware_gps_delete_aiding_data(UHardwareGps self, UHardwareGpsAidingData flags)
 {
+    printf("%s: %p \n", __PRETTY_FUNCTION__, self);
     self->delete_aiding_data(flags);
 }
 
+void u_hardware_gps_agps_set_server_for_type(
+        UHardwareGps self,
+        UHardwareGpsAGpsType type,
+        const char* hostname,
+        uint16_t port)
+{
+    self->set_server_for_type(type, hostname, port);
+}
+
+void u_hardware_gps_agps_set_reference_location(
+    UHardwareGps self,
+    UHardwareGpsAGpsRefLocation *location,
+    size_t size_of_struct)
+{
+    self->set_reference_location(location, size_of_struct);
+}
+
+void u_hardware_gps_agps_notify_connection_is_open(
+    UHardwareGps self,
+    const char *apn)
+{
+    self->notify_connection_is_open(apn);
+}
+
+void u_hardware_gps_agps_notify_connection_is_closed(UHardwareGps self)
+{
+    self->notify_connection_is_closed();
+}
+
+void u_hardware_gps_agps_notify_connection_not_available(UHardwareGps self)
+{
+    self->notify_connection_not_available();
+}
+
+
 bool u_hardware_gps_set_position_mode(UHardwareGps self, uint32_t mode, uint32_t recurrence,
                                   uint32_t min_interval, uint32_t preferred_accuracy,
                                   uint32_t preferred_time)
@@ -436,3 +574,4 @@
 {
     self->inject_xtra_data(data, length);
 }
+}

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-14 10:37:31 +0000
+++ debian/changelog	2014-01-22 16:11:40 +0000
@@ -14,32 +14,6 @@
 
  -- Ubuntu daily release <[e-mail]>  Tue, 14 Jan 2014 10:37:30 +0000
 
-platform-api (0.20-0ubuntu1) trusty; urgency=low
-
-  * Added *_set_dimensions() function to the window properties.
-
- -- Ricardo Mendoza <[e-mail]>  Tue, 10 Dec 2013 23:24:57 -0500
-
-platform-api (0.19+14.04.20140108.1-0ubuntu1) trusty; urgency=low
-
-  [ Alexandros Frantzis ]
-  * mirclient: Initialize MirSurfaceParameters::output_id field.
-
-  [ Martin Pitt ]
-  * Fix all compiler warnings.
-
-  [ Timo Jyrinki ]
-  * bump debian version dependency for mir to 0.1.3 to force rebuild
-
-  [ Gerry Boland ]
-  * Fix FTBFS with Mir12 change - mir::geometry::PixelFormat was
-    removed, using MirPixelFormat instead. (LP: #1266674)
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 179
-
- -- Ubuntu daily release <[e-mail]>  Wed, 08 Jan 2014 06:17:14 +0000
-
 platform-api (0.19+14.04.20131128.1-0ubuntu1) trusty; urgency=low
 
   [ Kevin Gunn ]

=== modified file 'debian/control'
--- debian/control	2014-01-08 15:17:41 +0000
+++ debian/control	2014-01-22 16:11:40 +0000
@@ -11,14 +11,12 @@
                g++-4.7,
                libhybris-common-dev,
                pkg-config,
-               libmirclient-dev (>= 0.1.3),
-               libmirserver-dev (>= 0.1.3),
+               libmirclient-dev (>= 0.1.2),
+               libmirserver-dev (>= 0.1.2),
                liburl-dispatcher1-dev,
                libdbus-1-dev,
                dbus-cpp-dev,
                libubuntu-location-service-dev,
-               libgtest-dev,
-               libprocess-cpp-dev (>= 0.0.1+14.04.20131212),
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/platform-api
 Vcs-Bzr: lp:platform-api
@@ -144,22 +142,6 @@
  The produced library should be used via libhybris, to communicate with the
  Android userspace, which is where the Ubuntu Application Manager lives.
 
-Package: libubuntu-application-api-test1
-Section: libs
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: test implementation of the Platform API
- This package provides an implementation of the Platform API for testing. It
- does not communicate with actual hardware, but reads input from a text file.
- .
- You need to explicitly enable this at runtime. Please see the README for
- details.
- .
- For now this provides simulated sensors.
-
 Package: libplatform-api1-hybris-tests
 Architecture: any
 Depends: ${misc:Depends},

=== removed file 'debian/libubuntu-application-api-test1.docs'
--- debian/libubuntu-application-api-test1.docs	2014-01-08 15:17:41 +0000
+++ debian/libubuntu-application-api-test1.docs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-src/ubuntu/testbackend/README.md

=== removed file 'debian/libubuntu-application-api-test1.install'
--- debian/libubuntu-application-api-test1.install	2014-01-08 15:17:41 +0000
+++ debian/libubuntu-application-api-test1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libubuntu_application_api_test.so.*

=== modified file 'debian/rules' (properties changed: -x to +x)
--- debian/rules	2014-01-09 18:52:10 +0000
+++ debian/rules	2014-01-22 16:11:40 +0000
@@ -11,11 +11,5 @@
 override_dh_auto_configure:
 	dh_auto_configure -- -DENABLE_MIRCLIENT_IMPLEMENTATION=true -DENABLE_MIRSERVER_IMPLEMENTATION=true
 
-override_dh_install:
+overrid_dh_install:
 	dh_install --fail-missing
-
-override_dh_auto_test:
-ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	cd obj-* && ctest --verbose
-endif
-

=== modified file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2013-07-05 09:13:31 +0000
+++ doc/Doxyfile.in	2014-01-22 16:11:40 +0000
@@ -1684,7 +1684,7 @@
 # explicitly to a value larger than 0 to get control over the balance
 # between CPU load and processing speed.
 
-DOT_NUM_THREADS        = 0
+DOT_NUM_THREADS        = 1 
 
 # By default doxygen will use the Helvetica font for all dot files that
 # doxygen generates. When you want a differently looking font you can specify

=== modified file 'include/ubuntu/application/ui/window_properties.h'
--- include/ubuntu/application/ui/window_properties.h	2013-12-11 04:56:15 +0000
+++ include/ubuntu/application/ui/window_properties.h	2014-01-22 16:11:40 +0000
@@ -76,12 +76,6 @@
         UAUiWindowProperties *properties,
         UAUiWindowInputEventCb cb,
         void *ctx);
-
-    UBUNTU_DLL_PUBLIC void
-    ua_ui_window_properties_set_dimensions(
-        UAUiWindowProperties *properties,
-        uint32_t width,
-        uint32_t height);
     
 #ifdef __cplusplus
 }

=== modified file 'include/ubuntu/hardware/gps.h'
--- include/ubuntu/hardware/gps.h	2013-08-22 07:17:47 +0000
+++ include/ubuntu/hardware/gps.h	2014-01-22 16:11:40 +0000
@@ -180,6 +180,37 @@
     U_HARDWARE_GPS_AGPS_DATA_CONN_FAILED = 5
 };
 
+/** Flags used to specify which aiding data to delete
+    when calling delete_aiding_data(). */
+typedef uint16_t UHardwareGpsAidingData;
+
+#define U_HARDWARE_GPS_DELETE_EPHEMERIS        0x0001
+#define U_HARDWARE_GPS_DELETE_ALMANAC          0x0002
+#define U_HARDWARE_GPS_DELETE_POSITION         0x0004
+#define U_HARDWARE_GPS_DELETE_TIME             0x0008
+#define U_HARDWARE_GPS_DELETE_IONO             0x0010
+#define U_HARDWARE_GPS_DELETE_UTC              0x0020
+#define U_HARDWARE_GPS_DELETE_HEALTH           0x0040
+#define U_HARDWARE_GPS_DELETE_SVDIR            0x0080
+#define U_HARDWARE_GPS_DELETE_SVSTEER          0x0100
+#define U_HARDWARE_GPS_DELETE_SADATA           0x0200
+#define U_HARDWARE_GPS_DELETE_RTI              0x0400
+#define U_HARDWARE_GPS_DELETE_CELLDB_INFO      0x8000
+#define U_HARDWARE_GPS_DELETE_ALL              0xFFFF
+
+/** AGPS type */
+typedef uint16_t UHardwareGpsAGpsType;
+#define U_HARDWARE_GPS_AGPS_TYPE_SUPL          1
+#define U_HARDWARE_GPS_AGPS_TYPE_C2K           2
+
+/** Known types for AGps reference locations. */
+/** A GSM cell ID. */
+#define U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_GSM_CELLID   1
+/** A UMTS cell ID. */
+#define U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_UMTS_CELLID  2
+/** The BSSID of a visible access point. */
+#define U_HARDWARE_GPS_AGPS_REG_LOCATION_TYPE_MAC          3
+
 /** UHardwareGpsLocation has valid latitude and longitude. */
 #define U_HARDWARE_GPS_LOCATION_HAS_LAT_LONG   0x0001
 /** UHardwareGpsLocation has valid altitude. */
@@ -207,8 +238,7 @@
     double latitude;
     /** Represents longitude in degrees. */
     double longitude;
-    /** Represents altitude in meters above the WGS 84 reference
-     * ellipsoid. */
+    /** Represents altitude in meters above the WGS 84 reference ellipsoid. */
     double altitude;
     /** Represents speed in meters per second. */
     float speed;
@@ -281,6 +311,46 @@
     uint32_t ipaddr;
 } UHardwareGpsAGpsStatus;
 
+/** \brief Describes a cell ID as understood by the GPS chipset. */
+typedef struct
+{
+    /** One of:
+     * U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_GSM_CELLID
+     * U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_UMTS_CELLID
+     */
+    uint16_t type;
+    /** Mobile country code. */
+    uint16_t mcc;
+    /** Mobile network code. */
+    uint16_t mnc;
+    /** Location area code. */
+    uint16_t lac;
+    /** The actual cell id. */
+    uint32_t cid;
+} UHardwareGpsAGpsRefLocationCellID;
+
+/** \brief Describes a wifi ID as understood by the GPS chipset. */
+typedef struct
+{
+    /** The MAC address/BSSID of an AP. */
+    uint8_t mac[6];
+} UHardwareGpsAGpsRefLocationMac;
+
+/** @brief Describes a reference location, either a radio cell or a wifi. */
+typedef struct
+{
+    /** One of:
+     * U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_GSM_CELLID
+     * U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_UMTS_CELLID
+     * U_HARDWARE_GPS_AGPS_REG_LOCATION_TYPE_MAC
+     */
+    uint16_t type;
+    union {
+        UHardwareGpsAGpsRefLocationCellID   cellID;
+        UHardwareGpsAGpsRefLocationMac      mac;
+    } u;
+} UHardwareGpsAGpsRefLocation;
+
 /**
  * Represents an NI request
  * \ingroup gps_access
@@ -353,23 +423,18 @@
 typedef void (*UHardwareGpsSetCapabilities)(uint32_t capabilities, void *context);
 typedef void (*UHardwareGpsRequestUtcTime)(void *context);
 
-/** Callback to request the client to download XTRA data.
- *  The client should download XTRA data and inject it by calling inject_xtra_data().
- */
+/** Callback to request the client to download XTRA data. The client should download XTRA data and inject it by calling inject_xtra_data(). */
 typedef void (*UHardwareGpsXtraDownloadRequest)(void *context);
 
-/** Callback with AGPS status information.
- */
+/** Callback with AGPS status information. */
 typedef void (*UHardwareGpsAGpsStatusCallback)(UHardwareGpsAGpsStatus *status, void *context);
 
-/** Callback with NI notification.
- */
+/** Callback with NI notification. */
 typedef void (*UHardwareGpsNiNotifyCallback)(UHardwareGpsNiNotification *notification, void *context);
 
-/*
- Callback for AGPS RIL (Radio Interface Library) set id
-*/
+/** Callback invoked by the driver to set the set id. */
 typedef void (*UHardwareGpsAGpsRilRequestSetId)(uint32_t flags, void *context);
+/** Callback invoked by the driver to request a reference location (typically cell ID). */
 typedef void (*UHardwareGpsAGpsRilRequestRefLoc)(uint32_t flags, void *context);
 
 typedef struct
@@ -409,10 +474,10 @@
 UBUNTU_DLL_PUBLIC bool
 u_hardware_gps_stop(UHardwareGps self);
 
-/*
-    \param time NTP time, in milliseconds since Jan 1st 1970.
-    \param time_reference time from the internal clock at the moment that NTP time was taken.
-    \param uncertainty possible deviation in the time supplied (uncertainty) in milliseconds.
+/** \brief Injects a new reference time into the GPS chipset.
+ *  \param time NTP time, in milliseconds since Jan 1st 1970.
+ *  \param time_reference time from the internal clock at the moment that NTP time was taken.
+ *  \param uncertainty possible deviation in the time supplied (uncertainty) in milliseconds.
  */
 UBUNTU_DLL_PUBLIC void
 u_hardware_gps_inject_time(
@@ -421,6 +486,13 @@
     int64_t time_reference,
     int uncertainty);
 
+/**
+  * \brief Injects a new reference location into the GPS chipset.
+  * \param self The instance to apply the chane to.
+  * \param latitude New coordinate, in [°].
+  * \param longitude New coordinate, [°].
+  * \param accuracy Accuracy estimate of the location, in [m].
+  */
 UBUNTU_DLL_PUBLIC void
 u_hardware_gps_inject_location(
     UHardwareGps self,
@@ -428,17 +500,75 @@
     double longitude,
     float accuracy);
 
+/**
+  * \brief Informs the GPS chipset about wifi ap's or radio cells to be used in AGPS calls.
+  * \param self The instance to inform.
+  * \param location The reference location, that is a wifi ap or a radio cell.
+  * \param size_of_struct The size of the reference location struct.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_set_reference_location(
+    UHardwareGps self,
+    UHardwareGpsAGpsRefLocation *location,
+    size_t size_of_struct);
+
+/**
+  * \brief Notifies the chipset that a data connection is availble.
+  * \param self The instance to be notified.
+  * \param apn Name of the apn to be used for SUPL.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_notify_connection_is_open(
+    UHardwareGps self,
+    const char *apn);
+
+/**
+  * \brief Notifies the chipset that an AGPS data connection has been closed.
+  * \param self The instance to be notified.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_notify_connection_is_closed(
+    UHardwareGps self);
+
+/**
+  * \brief Notifies the chipset that an AGPS data connection is not available.
+  * \param self The instance to be notified.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_notify_connection_not_available(
+        UHardwareGps self);
+
+/**
+  * \brief Sets the hostname and port for the AGPS server.
+  * \param self The instance to be altered.
+  * \param type Type of the server, one of U_HARDWARE_GPS_AGPS_TYPE_SUPL or U_HARDWARE_GPS_AGPS_TYPE_C2K.
+  * \param hostname The hostname of the AGPS server.
+  * \param port The post of the AGPS server.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_set_server_for_type(
+        UHardwareGps self,
+        UHardwareGpsAGpsType type,
+        const char* hostname,
+        uint16_t port);
+
+/**
+  * \brief Requests the chipset to delete the aiding data specified in flags.
+  * \param self The instance to apply the change to.
+  * \param flags Specifies the aiding data that should be deleted.
+  */
 UBUNTU_DLL_PUBLIC void
 u_hardware_gps_delete_aiding_data(
     UHardwareGps self,
-    uint16_t flags);
+    UHardwareGpsAidingData flags);
 
-/*
-    \param mode One of the U_HARDWARE_GPS_POSITION_MODE_* values
-    \param recurrence One of the U_HARDWARE_GPS_POSITION_RECURRENCE_* values
-    \param min_interval represents the time between fixes in milliseconds.
-    \param preferred_accuracy The requested fix accuracy in meters. Can be zero.
-    \param preferred_time The requested time to first fix in milliseconds. Can be zero.
+/**
+ * \brief Sets the positioning mode of the chipset.
+ * \param mode One of the U_HARDWARE_GPS_POSITION_MODE_* values
+ * \param recurrence One of the U_HARDWARE_GPS_POSITION_RECURRENCE_* values
+ * \param min_interval represents the time between fixes in milliseconds.
+ * \param preferred_accuracy The requested fix accuracy in meters. Can be zero.
+ * \param preferred_time The requested time to first fix in milliseconds. Can be zero.
  */
 UBUNTU_DLL_PUBLIC bool
 u_hardware_gps_set_position_mode(

=== modified file 'src/ubuntu/CMakeLists.txt'
--- src/ubuntu/CMakeLists.txt	2013-12-02 17:03:45 +0000
+++ src/ubuntu/CMakeLists.txt	2014-01-22 16:11:40 +0000
@@ -3,7 +3,6 @@
 )
 
 add_subdirectory(application)
-add_subdirectory(testbackend)
 
 set(
   UBUNTU_APPLICATION_API_LINK_LIBRARIES
@@ -26,4 +25,4 @@
 
 if(ENABLE_MIRCLIENT_IMPLEMENTATION)
   add_subdirectory(mirclient/)
-endif()
+endif()
\ No newline at end of file

=== modified file 'src/ubuntu/hybris/CMakeLists.txt'
--- src/ubuntu/hybris/CMakeLists.txt	2013-12-02 09:28:56 +0000
+++ src/ubuntu/hybris/CMakeLists.txt	2014-01-22 16:11:40 +0000
@@ -27,7 +27,6 @@
 
 target_link_libraries(
   ubuntu_platform_hardware_api
-  dl
   hybris-common
 )
 

=== modified file 'src/ubuntu/hybris/bridge.h'
--- src/ubuntu/hybris/bridge.h	2013-12-04 07:27:30 +0000
+++ src/ubuntu/hybris/bridge.h	2014-01-22 16:11:40 +0000
@@ -22,8 +22,6 @@
 #include <assert.h>
 #include <dlfcn.h>
 #include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define HIDDEN_SYMBOL __attribute__ ((visibility ("hidden")))
 
@@ -41,24 +39,19 @@
 namespace internal
 {
 
-/* By default we load the backend from /system/lib/libubuntu_application_api.so
- * Programs can select a different backend with $UBUNTU_PLATFORM_API_BACKEND,
- * which either needs to be a full path or just the file name (then it will be
- * looked up in the usual library search path, see dlopen(3)).
- */
 struct HIDDEN_SYMBOL ToApplication
 {
     static const char* path()
     {
-        static const char* cache = NULL;
-
-        if (cache == NULL) {
-            cache = secure_getenv("UBUNTU_PLATFORM_API_BACKEND");
-            if (cache == NULL)
-                cache = "/system/lib/libubuntu_application_api.so";
-        }
-
-        return cache;
+        return "/system/lib/libubuntu_application_api.so";
+    }
+};
+
+struct HIDDEN_SYMBOL ToHardware
+{
+    static const char* path()
+    {
+        return "/system/lib/libubuntu_platform_hardware_api.so";
     }
 };
 
@@ -74,23 +67,12 @@
 
     void* resolve_symbol(const char* symbol) const
     {
-        return dlsym_fn(lib_handle, symbol);
+        return android_dlsym(lib_handle, symbol);
     }
 
   protected:
     Bridge() : lib_handle(android_dlopen(Scope::path(), RTLD_LAZY))
     {
-        const char* path = Scope::path();
-        /* use Android dl functions for Android libs in /system/, glibc dl
-         * functions for others */
-        if (strncmp(path, "/system/", 8) == 0) {
-            lib_handle = android_dlopen(path, RTLD_LAZY);
-            dlsym_fn = android_dlsym;
-        } else {
-            lib_handle = dlopen(path, RTLD_LAZY);
-            dlsym_fn = dlsym;
-        }
-
         assert(lib_handle && "Error loading ubuntu_application_api");
     }
 
@@ -100,7 +82,6 @@
     }
 
     void* lib_handle;
-    void* (*dlsym_fn) (void*, const char*);
 };
 
 }
@@ -194,6 +175,13 @@
         DLSYM(&f, #symbol);                                      \
         f(_1, _2, _3, _4); }
 
+#define IMPLEMENT_VOID_SF_FUNCTION4(symbol, arg1, arg2, arg3, arg4) \
+    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)              \
+    {                                                            \
+        static void (*f)(arg1, arg2, arg3, arg4) __SF_FN_ATTR = NULL;         \
+        DLSYM(&f, #symbol);                                      \
+        f(_1, _2, _3, _4); }
+
 #define IMPLEMENT_FUNCTION4(return_type, symbol, arg1, arg2, arg3, arg4) \
     return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)               \
     {                                                                    \

=== modified file 'src/ubuntu/hybris/tests/test_gps_api.cpp'
--- src/ubuntu/hybris/tests/test_gps_api.cpp	2013-06-13 08:07:21 +0000
+++ src/ubuntu/hybris/tests/test_gps_api.cpp	2014-01-22 16:11:40 +0000
@@ -20,6 +20,7 @@
 #include <ctime>
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -30,10 +31,10 @@
   public:
     GPSTest();
     ~GPSTest();
-    bool init_and_start();
+    bool init_and_start(const char* server, uint16_t port);
     bool stop();
     void inject_time();
-
+    void inject_reference_location(float lat, float lon, float accuracy);
     UHardwareGps u_hardware_gps;
 };
 
@@ -176,10 +177,18 @@
                            10 /* possible deviation, in milliseconds*/);
 }
 
-bool GPSTest::init_and_start()
+void GPSTest::inject_reference_location(float lat, float lon, float accuracy)
+{
+    u_hardware_gps_inject_location(u_hardware_gps,
+                                   lat,
+                                   lon,
+                                   accuracy);
+}
+
+bool GPSTest::init_and_start(const char* supl_server, uint16_t port)
 {
     UHardwareGpsParams gps_params;
-
+    
     gps_params.location_cb = gps_location_cb;
     gps_params.status_cb = gps_status_cb;
     gps_params.sv_status_cb = gps_sb_status_cb;
@@ -207,6 +216,15 @@
         return false;
     }
 
+    u_hardware_gps_delete_aiding_data(u_hardware_gps,
+                                      U_HARDWARE_GPS_DELETE_ALL);
+
+    u_hardware_gps_agps_set_server_for_type(
+        u_hardware_gps,
+        U_HARDWARE_GPS_AGPS_TYPE_SUPL,
+        supl_server,
+        port);
+    
     return true;
 }
 
@@ -234,13 +252,28 @@
 
 int main(int argc, char** argv)
 {
+    if (argc != 6)
+    {
+        printf("Usage: test_gps supl_server supl_server_port lat lon accuracy\n");
+        return 1;
+    }
+
+    const char* supl_server = argv[1];
+    uint16_t port = atoi(argv[2]);
+    
+    double lat = atof(argv[3]);
+    double lon = atof(argv[4]);
+    float accuracy = atof(argv[5]);
+
     int return_value = 0;
     ubuntu::GPSTest test;
 
-    if (!test.init_and_start())
-        return 1;
+    if (!test.init_and_start(supl_server, port))
+        return 1;    
 
-    printf("GPS initialized and started. Now waiting for callbacks or SIGINT (to quit).\n");
+    printf("GPS initialized and started. Injecting reference location: %f %f %f.\n", lat, lon, accuracy);
+    test.inject_reference_location(lat, lon, accuracy);
+    printf("Now waiting for callbacks or SIGINT (to quit).\n");
     wait_for_sigint();
     printf("Exiting...\n");
 

=== modified file 'src/ubuntu/hybris/ubuntu_application_api_hybris.cpp'
--- src/ubuntu/hybris/ubuntu_application_api_hybris.cpp	2013-12-11 02:20:26 +0000
+++ src/ubuntu/hybris/ubuntu_application_api_hybris.cpp	2014-01-22 16:11:40 +0000
@@ -92,7 +92,6 @@
 IMPLEMENT_FUNCTION1(const char*, ua_ui_window_properties_get_title, UAUiWindowProperties*);
 IMPLEMENT_VOID_FUNCTION2(ua_ui_window_properties_set_role, UAUiWindowProperties*, UAUiWindowRole);
 IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_input_cb_and_ctx, UAUiWindowProperties*, UAUiWindowInputEventCb, void*);
-IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_dimensions, UAUiWindowProperties*, uint32_t, uint32_t);
 
 // UAUiWindow
 IMPLEMENT_FUNCTION2(UAUiWindow*, ua_ui_window_new_for_application_with_properties, UApplicationInstance*, UAUiWindowProperties*);

=== modified file 'src/ubuntu/hybris/ubuntu_platform_hardware_api.cpp'
--- src/ubuntu/hybris/ubuntu_platform_hardware_api.cpp	2013-06-13 08:37:52 +0000
+++ src/ubuntu/hybris/ubuntu_platform_hardware_api.cpp	2014-01-22 16:11:40 +0000
@@ -49,7 +49,7 @@
 int64_t, 
 int);
 
-IMPLEMENT_VOID_FUNCTION4(
+IMPLEMENT_VOID_SF_FUNCTION4(
 u_hardware_gps_inject_location, 
 UHardwareGps, 
 double, 
@@ -59,6 +59,32 @@
 IMPLEMENT_VOID_FUNCTION2(
 u_hardware_gps_delete_aiding_data, 
 UHardwareGps, 
+UHardwareGpsAidingData);
+
+IMPLEMENT_VOID_FUNCTION3(
+u_hardware_gps_agps_set_reference_location,
+UHardwareGps,
+UHardwareGpsAGpsRefLocation*,
+size_t);
+
+IMPLEMENT_VOID_FUNCTION2(
+u_hardware_gps_agps_notify_connection_is_open,
+UHardwareGps,
+const char *);
+
+IMPLEMENT_VOID_FUNCTION1(
+u_hardware_gps_agps_notify_connection_is_closed,
+UHardwareGps);
+
+IMPLEMENT_VOID_FUNCTION1(
+u_hardware_gps_agps_notify_connection_not_available,
+UHardwareGps);
+
+IMPLEMENT_VOID_FUNCTION4(
+u_hardware_gps_agps_set_server_for_type,
+UHardwareGps,
+UHardwareGpsAGpsType,
+const char*,
 uint16_t);
 
 IMPLEMENT_FUNCTION6(

=== modified file 'src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp	2013-12-11 02:20:26 +0000
+++ src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp	2014-01-22 16:11:40 +0000
@@ -232,12 +232,6 @@
     properties->set_input_cb_and_ctx(cb, ctx);
 }
 
-void ua_ui_window_properties_set_dimensions(UAUiWindowProperties *u_properties, uint32_t width, uint32_t height)
-{
-    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
-    properties->set_dimensions(width, height);
-}
-
 UAUiWindow* ua_ui_window_new_for_application_with_properties(UApplicationInstance* u_instance, UAUiWindowProperties* u_properties)
 {
     auto instance = uamc::Instance::from_u_application_instance(u_instance);

=== modified file 'src/ubuntu/mirclient/window_properties_mirclient.cpp'
--- src/ubuntu/mirclient/window_properties_mirclient.cpp	2013-12-11 04:36:18 +0000
+++ src/ubuntu/mirclient/window_properties_mirclient.cpp	2014-01-22 16:11:40 +0000
@@ -54,12 +54,6 @@
     input_ctx = ctx;
 }
 
-void uamc::WindowProperties::set_dimensions(uint32_t width, uint32_t height)
-{
-    parameters.width = width;
-    parameters.height = height;
-}
-
 void uamc::WindowProperties::set_role(UAUiWindowRole role)
 {
     if (role == U_ON_SCREEN_KEYBOARD_ROLE) {

=== modified file 'src/ubuntu/mirclient/window_properties_mirclient_priv.h'
--- src/ubuntu/mirclient/window_properties_mirclient_priv.h	2013-12-11 02:20:26 +0000
+++ src/ubuntu/mirclient/window_properties_mirclient_priv.h	2014-01-22 16:11:40 +0000
@@ -47,7 +47,6 @@
     
     void set_title(char const* title, size_t length);
     void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
-    void set_dimensions(uint32_t width, uint32_t height);
     void set_role(UAUiWindowRole role);    
     
     MirSurfaceParameters const& surface_parameters() const;

=== modified file 'src/ubuntu/mircommon/application_options_mir.cpp'
--- src/ubuntu/mircommon/application_options_mir.cpp	2013-12-19 15:04:23 +0000
+++ src/ubuntu/mircommon/application_options_mir.cpp	2014-01-22 16:11:40 +0000
@@ -24,12 +24,8 @@
 #include <getopt.h>
 
 #include <tuple>
-#include <iostream>
-#include <fstream>
 #include <string>
 
-#include <unistd.h>
-
 namespace uam = ubuntu::application::mir;
 
 UApplicationOptions* uam::Options::as_u_application_options()
@@ -47,11 +43,11 @@
 UAUiStage
 string_to_stage(std::string const& s)
 {
-    if (s == "main_stage" || s == "MainStage")
+    if (s == "main_stage")
         return U_MAIN_STAGE;
-    else if (s == "side_stage" || s == "SideStage")
+    else if (s == "side_stage")
         return U_SIDE_STAGE;
-    else if (s == "share_stage" || s == "ShareStage")
+    else if (s == "share_stage")
         return U_SHARE_STAGE;
 }
 
@@ -99,60 +95,6 @@
 
     auto app_options = new uam::Options;
 
-    // Construct legacy desktop file path
-    std::string desktop_file_name;
-    if (getenv("APP_ID"))
-    {
-        desktop_file_name = getenv("APP_ID");
-        desktop_file_name.append(".desktop");
-    }
-
-    // Click desktop path
-    std::string local_path;
-    if (getenv("APP_DESKTOP_FILE_PATH"))
-        local_path = getenv("APP_DESKTOP_FILE_PATH");;        
-
-    // Check StageHint
-    std::string line, stage_hint;
-    std::string stage_key("X-Ubuntu-StageHint");
-    
-    std::ifstream infile;
-    std::string search_paths[2] = {"/usr/share/applications/", local_path};
-    search_paths[0].append(desktop_file_name);
-    for (std::string path : search_paths)
-    {
-        if (path.empty())
-            continue;
-
-        infile.open(path);
-        if (!infile)
-            continue;
-
-        std::getline(infile, line);
-        while (std::getline(infile, line))
-        {
-            if (infile.eof())
-                break;
-          
-            // Check for non key-value line 
-            if (line.find("=") == std::string::npos)
-                continue;
-            
-            std::string lhs = line.substr(0,line.find("="));
-            std::string rhs = line.substr(line.find("="));
-
-            // Fetch Stage
-            if (lhs.compare(stage_key) == 0)
-            {
-                stage_hint = rhs.substr(1);
-                break;
-            }
-        }
-    }
-
-    if (!stage_hint.empty())
-        app_options->stage = string_to_stage(stage_hint);
-
     while(true)
     {
         int option_index = 0;
@@ -182,7 +124,6 @@
                     app_options->form_factor = string_to_form_factor(std::string(optarg));
                     break;
                 case stage_hint_index:
-                    // Override if set
                     app_options->stage = string_to_stage(std::string(optarg));
                     break;
                 case desktop_file_hint_index:

=== modified file 'src/ubuntu/mircommon/lifecycle_delegate_mir_priv.h'
--- src/ubuntu/mircommon/lifecycle_delegate_mir_priv.h	2014-01-07 11:00:33 +0000
+++ src/ubuntu/mircommon/lifecycle_delegate_mir_priv.h	2014-01-22 16:11:40 +0000
@@ -19,7 +19,7 @@
 #ifndef UBUNTU_APPLICATION_LIECYCLE_DELEGATE_MIR_PRIV_H_
 #define UBUNTU_APPLICATION_LIECYCLE_DELEGATE_MIR_PRIV_H_
 
-#include "mir_toolkit/common.h"
+#include "mircommon/mir_toolkit/common.h"
 
 #include <ubuntu/application/lifecycle_delegate.h>
 

=== modified file 'src/ubuntu/mirserver/CMakeLists.txt'
--- src/ubuntu/mirserver/CMakeLists.txt	2014-01-09 18:47:45 +0000
+++ src/ubuntu/mirserver/CMakeLists.txt	2014-01-22 16:11:40 +0000
@@ -25,6 +25,8 @@
 )
 
 
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/priv/mirserver)
+
 set_target_properties(
 	ubuntu_application_api_mirserver
 	PROPERTIES

=== modified file 'src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp	2014-01-08 14:45:43 +0000
+++ src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp	2014-01-22 16:11:40 +0000
@@ -214,7 +214,7 @@
 
 namespace
 {
-static MirPixelFormat choose_pixel_format(std::shared_ptr<mir::graphics::GraphicBufferAllocator> const& allocator)
+static mir::geometry::PixelFormat choose_pixel_format(std::shared_ptr<mir::graphics::GraphicBufferAllocator> const& allocator)
 {
     auto formats = allocator->supported_pixel_formats();
     return formats[0];
@@ -259,12 +259,6 @@
     properties->set_input_cb_and_ctx(cb, ctx);
 }
 
-void ua_ui_window_properties_set_dimensions(UAUiWindowProperties *u_properties, uint32_t width, uint32_t height)
-{
-    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
-    properties->set_dimensions(width, height);
-}
-
 UAUiWindow* ua_ui_window_new_for_application_with_properties(UApplicationInstance* u_instance, UAUiWindowProperties* u_properties)
 {
     auto input_platform = global_mirserver_context()->input_platform;

=== modified file 'src/ubuntu/mirserver/window_properties_mirserver.cpp'
--- src/ubuntu/mirserver/window_properties_mirserver.cpp	2014-01-08 14:45:43 +0000
+++ src/ubuntu/mirserver/window_properties_mirserver.cpp	2014-01-22 16:11:40 +0000
@@ -22,6 +22,7 @@
 
 namespace uams = ubuntu::application::mir::server;
 namespace msh = mir::shell;
+namespace geom = mir::geometry;
 
 uams::WindowProperties::WindowProperties()
     : parameters(msh::a_surface()),
@@ -51,16 +52,11 @@
     input_ctx = ctx;
 }
 
-void uams::WindowProperties::set_dimensions(uint32_t width, uint32_t height)
-{
-    parameters = parameters.of_size(width, height);
-}
-
-void uams::WindowProperties::set_pixel_format(MirPixelFormat const& format)
+void uams::WindowProperties::set_pixel_format(geom::PixelFormat const& format)
 {
     parameters = parameters.of_pixel_format(format);
 }
-
+    
 msh::SurfaceCreationParameters const& uams::WindowProperties::surface_parameters() const
 {
     return parameters;

=== modified file 'src/ubuntu/mirserver/window_properties_mirserver_priv.h'
--- src/ubuntu/mirserver/window_properties_mirserver_priv.h	2014-01-08 14:45:43 +0000
+++ src/ubuntu/mirserver/window_properties_mirserver_priv.h	2014-01-22 16:11:40 +0000
@@ -22,7 +22,7 @@
 #include <ubuntu/application/ui/window.h>
 
 #include <mir/shell/surface_creation_parameters.h>
-#include <mir_toolkit/common.h>
+#include <mir/geometry/pixel_format.h>
 
 namespace ubuntu
 {
@@ -44,8 +44,7 @@
     
     void set_title(char const* title, size_t length);
     void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
-    void set_dimensions(uint32_t width, uint32_t height);
-    void set_pixel_format( MirPixelFormat const& format);
+    void set_pixel_format( ::mir::geometry::PixelFormat const& format);
     
     ::mir::shell::SurfaceCreationParameters const& surface_parameters() const;
     UAUiWindowInputEventCb input_cb() const;

=== removed directory 'src/ubuntu/testbackend'
=== removed file 'src/ubuntu/testbackend/CMakeLists.txt'
--- src/ubuntu/testbackend/CMakeLists.txt	2014-01-08 15:17:41 +0000
+++ src/ubuntu/testbackend/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
-
-add_library(
-  ubuntu_application_api_test SHARED
-  ubuntu_application_sensors.cpp
-)
-
-set_target_properties(
-  ubuntu_application_api_test
-  PROPERTIES
-  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
-  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
-)
-
-install(
-  TARGETS ubuntu_application_api_test
-  # this is not a development library to compile against, users should always
-  # specify the SONAME; so don't build a *.so
-  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
-)
-

=== removed file 'src/ubuntu/testbackend/README.md'
--- src/ubuntu/testbackend/README.md	2014-01-08 15:17:41 +0000
+++ src/ubuntu/testbackend/README.md	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-Testing applications with simulated sensor data
-===============================================
-
-Purpose
--------
-platform-api's interface to sensor data is in the shared library
-`libubuntu_platform_hardware_api.so`. That is only a stub which dynamically
-(dlopen) loads a backend library which provides the actual implementation. By
-default this is `/system/lib/libubuntu_application_api.so` which reads sensor
-data from the Android side. For testing purposes this can be replaced with this
-`libubuntu_application_api_test.so.1` which simulates sensors and their data based
-on a simple text input file.
-
-Using the test sensors
-----------------------
-Run your application under test with the environment variable
-
-    UBUNTU_PLATFORM_API_BACKEND=libubuntu_application_api_test.so.1
-
-and make sure that ld.so(8) can find it. If you don't have the library
-installed in a standard system library path, it is recommended to set
-`LD_LIBRARY_PATH` to the directory that contains the library (usually when using
-the library right out of the build tree). Alternatively you can specify the
-full path in `$UBUNTU_PLATFORM_API_BACKEND`.
-
-The env variable `$UBUNTU_PLATFORM_API_SENSOR_TEST` needs to point to a file that
-describes the desired sensor behaviour.
-
-Data format
------------
-The test sensors use a simple line based file format. The first part
-instantiates desired sensors with their parameters:
-
-    create [accel|light] <min> <max> <resolution>
-    # but no arguments for proximity sensor: 
-    create proximity
-  
-After that, it defines events; <delay> specifies time after previous event
-in ms:
-
-    <delay> proximity [unknown|near|far]
-    <delay> light <value>
-    <delay> accel <x> <y> <z>
-
-Empty lines and comment lines (starting with #) are allowed.
-
-Example file:
-
-    create light 0 10 1
-    create accel 0 1000 0.1
-    create proximity
-     
-    200 proximity near
-    500 light 5
-    # simulate crash on the ground
-    500 accel 0.2 0.1 10
-    100 accel 0.2 0.2 1000
-    20 accel 0 0 0
-    10 proximity far
-    0 light 10
-
-
-Complete example
-----------------
- * Build platform-api:
-
-        mkdir obj; (cd obj; cmake .. && make)
-
- * Put above example file into /tmp/test.sensors
-
- * Run the sensor test with it:
- 
-        LD_LIBRARY_PATH=obj/src/ubuntu/testbackend \
-        UBUNTU_PLATFORM_API_BACKEND=libubuntu_application_api_test.so.1 \
-        UBUNTU_PLATFORM_API_SENSOR_TEST=/tmp/test.sensors \
-        obj/src/ubuntu/hybris/tests/test_android_sensors_api
-

=== removed file 'src/ubuntu/testbackend/ubuntu_application_sensors.cpp'
--- src/ubuntu/testbackend/ubuntu_application_sensors.cpp	2013-12-12 14:40:21 +0000
+++ src/ubuntu/testbackend/ubuntu_application_sensors.cpp	1970-01-01 00:00:00 +0000
@@ -1,553 +0,0 @@
-/*
- * Copyright (C) 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: Martin Pitt <[e-mail]>
- */
-
-#include <ubuntu/application/sensors/ubuntu_application_sensors.h>
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/light.h>
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <cerrno>
-#include <csignal>
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <stdexcept>
-#include <chrono>
-#include <map>
-#include <memory>
-
-using namespace std;
-
-// necessary for functions that return float
-// pcs attribute (calling convention) is only defined on ARM, avoid warning on
-// other platforms
-#ifdef __arm__
-#define __SF_FN_ATTR __attribute__((pcs("aapcs")))
-#else
-#define __SF_FN_ATTR
-#endif
-
-
-/***************************************
- *
- * test sensor implementation
- *
- ***************************************/
-
-// this is only internal API, so we make everything public
-struct TestSensor
-{
-    TestSensor(ubuntu_sensor_type _type, float _min_value, float _max_value, float _resolution) :
-        type(_type),
-        enabled(false),
-        resolution(_resolution),
-        min_delay(0),
-        min_value(_min_value),
-        max_value(_max_value),
-        on_event_cb(NULL),
-        event_cb_context(NULL),
-        x(_min_value),
-        y(_min_value),
-        z(_min_value),
-        distance((UASProximityDistance) 0),  // LP#1256969
-        timestamp(0)
-    {}
-
-    ubuntu_sensor_type type;
-    bool enabled;
-    float resolution;
-    uint32_t min_delay;
-    float min_value, max_value;
-    void (*on_event_cb)(void*, void*);
-    void* event_cb_context;
-
-    /* current value; note that we do not track separate Event objects/pointers
-     * at all, and just always deliver the current value */
-    float x, y, z;
-    UASProximityDistance distance;
-    uint64_t timestamp;
-};
-
-/* Singleton which reads the sensor data file and maintains the TestSensor
- * instances */
-class SensorController
-{
-  public:
-    // Ensure that controller is initialized, and return singleton
-    static SensorController& instance()
-    {
-        static SensorController _inst;
-        return _inst;
-    }
-
-    // Return TestSensor of given type, or NULL if it doesn't exist
-    TestSensor* get(ubuntu_sensor_type type)
-    {
-        try {
-            return sensors.at(type).get();
-        } catch (const out_of_range&) {
-            return NULL;
-        }
-    }
-
-  private:
-    SensorController();
-    bool next_command();
-    bool process_create_command();
-    void process_event_command();
-    void setup_timer(unsigned delay_ms);
-    static void on_timer(union sigval sval);
-
-    static ubuntu_sensor_type type_from_name(const string& type)
-    {
-        if (type == "light")
-            return ubuntu_sensor_type_light;
-        if (type == "proximity")
-            return ubuntu_sensor_type_proximity;
-        if (type == "accel")
-            return ubuntu_sensor_type_accelerometer;
-
-        cerr << "TestSensor ERROR: unknown sensor type " << type << endl;
-        abort();
-    }
-
-    map<ubuntu_sensor_type, shared_ptr<TestSensor>> sensors;
-    ifstream data;
-
-    // current command/event
-    string current_command;
-    TestSensor* event_sensor;
-    float event_x, event_y, event_z;
-    UASProximityDistance event_distance;
-};
-
-SensorController::SensorController()
-{
-    const char* path = getenv("UBUNTU_PLATFORM_API_SENSOR_TEST");
-
-    if (path == NULL) {
-        cerr << "TestSensor ERROR: Need $UBUNTU_PLATFORM_API_SENSOR_TEST to point to a data file\n";
-        abort();
-    }
-
-    //cout << "SensorController ctor: opening " << path << endl;
-
-    data.open(path);
-    if (!data.is_open()) {
-        cerr << "TestSensor ERROR: Failed to open data file " << path << ": " << strerror(errno) << endl;
-        abort();
-    }
-
-    // process all "create" commands
-    while (next_command()) {
-        if (!process_create_command())
-            break;
-    }
-
-    // start event processing
-    if (!data.eof())
-        process_event_command();
-}
-
-bool
-SensorController::next_command()
-{
-    while (getline(data, current_command)) {
-        // trim leading and trailing space
-        current_command.erase(0, current_command.find_first_not_of(" \t"));
-        current_command.erase(current_command.find_last_not_of(" \t") + 1);
-        // ignore empty or comment lines
-        if (current_command.size() == 0 || current_command[0] == '#')
-            continue;
-        return true;
-    }
-    return false;
-}
-
-bool
-SensorController::process_create_command()
-{
-    stringstream ss(current_command, ios_base::in);
-    string token;
-
-    // we only process "create" commands here; if we have something else, stop
-    ss >> token;
-    if (token != "create")
-        return false;
-
-    ss >> token;
-    ubuntu_sensor_type type = type_from_name(token);
-
-    if (get(type) != NULL) {
-        cerr << "TestSensor ERROR: duplicate creation of sensor type " << token << endl;
-        abort();
-    }
-
-    float min = 0, max = 0, resolution = 0;
-
-    if (type != ubuntu_sensor_type_proximity) {
-        // read min, max, resolution
-        ss >> min >> max >> resolution;
-
-        if (max <= min) {
-            cerr << "TestSensor ERROR: max_value must be >= min_value in  " << current_command << endl;
-            abort();
-        }
-        if (resolution <= 0) {
-            cerr << "TestSensor ERROR: resolution must be > 0 in " << current_command << endl;
-            abort();
-        }
-    }
-
-    //cout << "SensorController::process_create_command: type " << type << " min " << min << " max " << max << " res " << resolution << endl;
-
-    sensors[type] = make_shared<TestSensor>(type, min, max, resolution);
-    return true;
-}
-
-void
-SensorController::process_event_command()
-{
-    stringstream ss(current_command, ios_base::in);
-    int delay;
-
-    //cout << "TestSensor: processing event " << current_command << endl;
-
-    // parse delay
-    ss >> delay;
-    if (delay <= 0) {
-        cerr << "TestSensor ERROR: delay must be positive in command " << current_command << endl;
-        abort();
-    }
-
-    // parse sensor type
-    string token;
-    ss >> token;
-    ubuntu_sensor_type type = type_from_name(token);
-    event_sensor = get(type);
-    if (event_sensor == NULL) {
-        cerr << "TestSensor ERROR: sensor does not exist, you need to create it: " << token << endl;
-        abort();
-    }
-
-    switch (type) {
-        case ubuntu_sensor_type_light:
-            ss >> event_x;
-            //cout << "got event: sensor type " << type << " (light), delay "
-            //     << delay << " ms, value " << event_x << endl;
-            break;
-
-        case ubuntu_sensor_type_accelerometer:
-            ss >> event_x >> event_y >> event_z;
-            //cout << "got event: sensor type " << type << " (accel), delay "
-            //     << delay << " ms, value " << event_x << "/" << event_y << "/" << event_z << endl;
-            break;
-
-        case ubuntu_sensor_type_proximity:
-            ss >> token;
-            if (token == "unknown")
-                event_distance = (UASProximityDistance) 0;  // LP#1256969
-            else if (token == "near")
-                event_distance = U_PROXIMITY_NEAR;
-            else if (token == "far")
-                event_distance = U_PROXIMITY_FAR;
-            else {
-                cerr << "TestSensor ERROR: unknown proximity value " << token << endl;
-                abort();
-            }
-            //cout << "got event: sensor type " << type << " (proximity), delay "
-            //     << delay << " ms, value " << int(event_distance) << endl;
-            break;
-
-        default:
-            cerr << "TestSensor ERROR: unhandled sensor type " << token << endl;
-            abort();
-    }
-
-    // wake up after given delay for committing the change and processing the
-    // next event
-    setup_timer(unsigned(delay));
-}
-
-void
-SensorController::setup_timer(unsigned delay_ms)
-{
-    static timer_t timerid; // we keep a pointer to that until on_timer
-    struct sigevent sev;
-    struct itimerspec its { {0, 0}, // interval
-                            {time_t(delay_ms / 1000),
-                             long((delay_ms % 1000) * 1000000L) % 1000000000L } };
-
-    sev.sigev_notify = SIGEV_THREAD;
-    sev.sigev_notify_function = SensorController::on_timer;
-    sev.sigev_notify_attributes = NULL;
-    sev.sigev_value.sival_ptr = &timerid;
-
-    if (timer_create(CLOCK_MONOTONIC, &sev, &timerid) < 0) {
-        perror("TestSensor ERROR: Failed to create timer");
-        abort();
-    }
-    if (timer_settime(timerid, 0, &its, NULL) < 0) {
-        perror("TestSensor ERROR: Failed to set up timer");
-        abort();
-    };
-}
-
-void
-SensorController::on_timer(union sigval sval)
-{
-    timer_t* timerid = static_cast<timer_t*>(sval.sival_ptr);
-    //cout << "on_timer called\n";
-    timer_delete(*timerid);
-
-    SensorController& sc = SensorController::instance();
-
-    // update sensor values, call callback
-    if (sc.event_sensor && sc.event_sensor->enabled) {
-        sc.event_sensor->x = sc.event_x;
-        sc.event_sensor->y = sc.event_y;
-        sc.event_sensor->z = sc.event_z;
-        sc.event_sensor->distance = sc.event_distance;
-        sc.event_sensor->timestamp = chrono::duration_cast<chrono::nanoseconds>(
-                chrono::system_clock::now().time_since_epoch()).count();
-        if (sc.event_sensor->on_event_cb != NULL) {
-            //cout << "TestSensor: calling sensor callback for type " << sc.event_sensor->type << endl;
-            sc.event_sensor->on_event_cb(sc.event_sensor, sc.event_sensor->event_cb_context);
-        } else {
-            //cout << "TestSensor: sensor type " << sc.event_sensor->type << "has no callback\n";
-        }
-    } else {
-        //cout << "TestSensor: sensor type " << sc.event_sensor->type << "disabled, not processing event\n";
-    }
-
-    // read/process next event
-    if (sc.next_command())
-        sc.process_event_command();
-    else {
-        //cout << "TestSensor: script ended, no further commands\n";
-    }
-}
-
-
-/***************************************
- *
- * Acceleration API
- *
- ***************************************/
-
-UASensorsAccelerometer* ua_sensors_accelerometer_new()
-{
-    return SensorController::instance().get(ubuntu_sensor_type_accelerometer);
-}
-
-UStatus ua_sensors_accelerometer_enable(UASensorsAccelerometer* s)
-{
-    static_cast<TestSensor*>(s)->enabled = true;
-    return (UStatus) 0;
-}
-
-UStatus ua_sensors_accelerometer_disable(UASensorsAccelerometer* s)
-{
-    static_cast<TestSensor*>(s)->enabled = false;
-    return (UStatus) 0;
-}
-
-uint32_t ua_sensors_accelerometer_get_min_delay(UASensorsAccelerometer* s)
-{
-    return static_cast<TestSensor*>(s)->min_delay;
-}
-
-float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer* s) __SF_FN_ATTR;
-float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer* s)
-{
-    return static_cast<TestSensor*>(s)->min_value;
-}
-
-float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer* s) __SF_FN_ATTR;
-float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer* s)
-{
-    return static_cast<TestSensor*>(s)->max_value;
-}
-
-float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer* s) __SF_FN_ATTR;
-float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer* s)
-{
-    return static_cast<TestSensor*>(s)->resolution;
-}
-
-void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer* s, on_accelerometer_event_cb cb, void* ctx)
-{
-    TestSensor* sensor = static_cast<TestSensor*>(s);
-    sensor->on_event_cb = cb;
-    sensor->event_cb_context = ctx;
-}
-
-uint64_t uas_accelerometer_event_get_timestamp(UASAccelerometerEvent* e)
-{
-    return static_cast<TestSensor*>(e)->timestamp;
-}
-
-float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent* e) __SF_FN_ATTR;
-float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent* e)
-{
-    return static_cast<TestSensor*>(e)->x;
-}
-
-float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent* e) __SF_FN_ATTR;
-float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent* e)
-{
-    return static_cast<TestSensor*>(e)->y;
-}
-
-float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent* e) __SF_FN_ATTR;
-float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent* e)
-{
-    return static_cast<TestSensor*>(e)->z;
-}
-
-/***************************************
- *
- * Proximity API
- *
- ***************************************/
-
-UASensorsProximity* ua_sensors_proximity_new()
-{
-    return SensorController::instance().get(ubuntu_sensor_type_proximity);
-}
-
-UStatus ua_sensors_proximity_enable(UASensorsProximity* s)
-{
-    static_cast<TestSensor*>(s)->enabled = true;
-    return (UStatus) 0;
-}
-
-UStatus ua_sensors_proximity_disable(UASensorsProximity* s)
-{
-    static_cast<TestSensor*>(s)->enabled = false;
-    return (UStatus) 0;
-}
-
-uint32_t ua_sensors_proximity_get_min_delay(UASensorsProximity* s)
-{
-    return static_cast<TestSensor*>(s)->min_delay;
-}
-
-// the next three function make no sense in the API, just return zero
-float ua_sensors_proximity_get_min_value(UASensorsProximity*) __SF_FN_ATTR;
-float ua_sensors_proximity_get_min_value(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-float ua_sensors_proximity_get_max_value(UASensorsProximity*) __SF_FN_ATTR;
-float ua_sensors_proximity_get_max_value(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-float ua_sensors_proximity_get_resolution(UASensorsProximity*) __SF_FN_ATTR;
-float ua_sensors_proximity_get_resolution(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-void ua_sensors_proximity_set_reading_cb(UASensorsProximity* s, on_proximity_event_cb cb, void* ctx)
-{
-    TestSensor* sensor = static_cast<TestSensor*>(s);
-    sensor->on_event_cb = cb;
-    sensor->event_cb_context = ctx;
-}
-
-uint64_t uas_proximity_event_get_timestamp(UASProximityEvent* e)
-{
-    return static_cast<TestSensor*>(e)->timestamp;
-}
-
-UASProximityDistance uas_proximity_event_get_distance(UASProximityEvent* e)
-{
-    return static_cast<TestSensor*>(e)->distance;
-}
-
-
-/***************************************
- *
- * Light API
- *
- ***************************************/
-
-UASensorsLight* ua_sensors_light_new()
-{
-    return SensorController::instance().get(ubuntu_sensor_type_light);
-}
-
-UStatus ua_sensors_light_enable(UASensorsLight* s)
-{
-    static_cast<TestSensor*>(s)->enabled = true;
-    return (UStatus) 0;
-}
-
-UStatus ua_sensors_light_disable(UASensorsLight* s)
-{
-    static_cast<TestSensor*>(s)->enabled = false;
-    return (UStatus) 0;
-}
-
-uint32_t ua_sensors_light_get_min_delay(UASensorsLight* s)
-{
-    return static_cast<TestSensor*>(s)->min_delay;
-}
-
-float ua_sensors_light_get_min_value(UASensorsLight* s) __SF_FN_ATTR;
-float ua_sensors_light_get_min_value(UASensorsLight* s)
-{
-    return static_cast<TestSensor*>(s)->min_value;
-}
-
-float ua_sensors_light_get_max_value(UASensorsLight* s) __SF_FN_ATTR;
-float ua_sensors_light_get_max_value(UASensorsLight* s)
-{
-    return static_cast<TestSensor*>(s)->max_value;
-}
-
-float ua_sensors_light_get_resolution(UASensorsLight* s) __SF_FN_ATTR;
-float ua_sensors_light_get_resolution(UASensorsLight* s)
-{
-    return static_cast<TestSensor*>(s)->resolution;
-}
-
-void ua_sensors_light_set_reading_cb(UASensorsLight* s, on_light_event_cb cb, void* ctx)
-{
-    TestSensor* sensor = static_cast<TestSensor*>(s);
-    sensor->on_event_cb = cb;
-    sensor->event_cb_context = ctx;
-}
-
-uint64_t uas_light_event_get_timestamp(UASLightEvent* e)
-{
-    return static_cast<TestSensor*>(e)->timestamp;
-}
-
-float uas_light_event_get_light(UASLightEvent* e) __SF_FN_ATTR;
-float uas_light_event_get_light(UASLightEvent* e)
-{
-    return static_cast<TestSensor*>(e)->x;
-}

=== removed directory 'tests'
=== removed file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-12-06 13:47:56 +0000
+++ tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
-
-include_directories(${GTEST_ROOT}/src)
-include_directories(${PROCESS_CPP_INCLUDE_DIRS})
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
-
-add_executable(
-    test_ubuntu_application_sensors
-    test_ubuntu_application_sensors.cpp
-)
-
-target_link_libraries(
-    test_ubuntu_application_sensors
-
-    ubuntu_application_api
-    gtest
-    gtest_main
-    ${PROCESS_CPP_LIBRARIES}
-)
-
-# we need to call the tests with pointing to the locally built test platform
-# library
-add_test(
-    test_ubuntu_application_sensors
-    
-    env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/ubuntu/testbackend ${CMAKE_CURRENT_BINARY_DIR}/test_ubuntu_application_sensors
-)
-

=== removed file 'tests/test_ubuntu_application_sensors.cpp'
--- tests/test_ubuntu_application_sensors.cpp	2014-01-08 15:17:41 +0000
+++ tests/test_ubuntu_application_sensors.cpp	1970-01-01 00:00:00 +0000
@@ -1,243 +0,0 @@
-/*
- * Copyright (C) 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: Martin Pitt <[e-mail]>
- */
-
-#include <cstdlib>
-#include <cstdio>
-#include <queue>
-#include <chrono>
-
-#include <core/testing/fork_and_run.h>
-
-#include "gtest/gtest.h"
-
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/event/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/event/proximity.h>
-#include <ubuntu/application/sensors/light.h>
-#include <ubuntu/application/sensors/event/light.h>
-
-using namespace std;
-
-typedef chrono::time_point<chrono::system_clock,chrono::nanoseconds> time_point_system_ns;
-
-struct event {
-    uint64_t timestamp;
-    float x, y, z;
-    UASProximityDistance distance;
-    void* context;
-};
-queue<struct event> events;
-
-class APITest : public testing::Test
-{
-  protected:
-    virtual void SetUp()
-    {
-        snprintf(data_file, sizeof(data_file), "%s", "/tmp/sensor_test.XXXXXX");
-        data_fd = mkstemp(data_file);
-        if (data_fd < 0) {
-            perror("mkstemp");
-            abort();
-        }
-        setenv("UBUNTU_PLATFORM_API_SENSOR_TEST", data_file, 1);
-        setenv("UBUNTU_PLATFORM_API_BACKEND", "libubuntu_application_api_test.so.1", 1);
-
-        // ensure the queue is clear
-        while (events.size() > 0)
-            events.pop();
-    }
-
-    virtual void TearDown()
-    {
-        unlink(data_file);
-    }
-
-    void set_data(const char* data)
-    {
-        write(data_fd, data, strlen(data));
-        fsync(data_fd);
-    }
-
-    char data_file[100];
-    int data_fd;
-};
-
-// without any data, there are no sensors defined
-TESTP_F(APITest, NoData, {
-    EXPECT_EQ(NULL, ua_sensors_accelerometer_new());
-    EXPECT_EQ(NULL, ua_sensors_proximity_new());
-    EXPECT_EQ(NULL, ua_sensors_light_new());
-})
-
-TESTP_F(APITest, CreateProximity, {
-    set_data("create proximity");
-    EXPECT_EQ(NULL, ua_sensors_accelerometer_new());
-    EXPECT_EQ(NULL, ua_sensors_light_new());
-
-    UASensorsProximity *s = ua_sensors_proximity_new();
-    EXPECT_TRUE(s != NULL);
-})
-
-TESTP_F(APITest, CreateAccelerator, {
-    set_data("create accel 0.5 1000 0.1");
-    EXPECT_EQ(NULL, ua_sensors_proximity_new());
-    EXPECT_EQ(NULL, ua_sensors_light_new());
-
-    UASensorsAccelerometer *s = ua_sensors_accelerometer_new();
-    EXPECT_TRUE(s != NULL);
-    EXPECT_FLOAT_EQ(0.5, ua_sensors_accelerometer_get_min_value(s));
-    EXPECT_FLOAT_EQ(1000.0, ua_sensors_accelerometer_get_max_value(s));
-    EXPECT_FLOAT_EQ(0.1, ua_sensors_accelerometer_get_resolution(s));
-})
-
-TESTP_F(APITest, CreateLight, {
-    set_data("create light 0 10 0.5");
-    EXPECT_EQ(NULL, ua_sensors_proximity_new());
-    EXPECT_EQ(NULL, ua_sensors_accelerometer_new());
-
-    UASensorsLight *s = ua_sensors_light_new();
-    EXPECT_TRUE(s != NULL);
-    EXPECT_FLOAT_EQ(0.0, ua_sensors_light_get_min_value(s));
-    EXPECT_FLOAT_EQ(10.0, ua_sensors_light_get_max_value(s));
-    EXPECT_FLOAT_EQ(0.5, ua_sensors_light_get_resolution(s));
-})
-
-TESTP_F(APITest, ProximityEvents, {
-    set_data("create proximity\n"
-             "  # some comment\n"
-             "  \n"
-             "50 proximity near\n"
-             "100 proximity far\n"
-             "80 proximity unknown\n"
-    );
-
-    UASensorsProximity *s = ua_sensors_proximity_new();
-    EXPECT_TRUE(s != NULL);
-    ua_sensors_proximity_enable(s);
-    auto start_time = chrono::system_clock::now();
-
-    ua_sensors_proximity_set_reading_cb(s,
-        [](UASProximityEvent* ev, void* ctx) {
-            events.push({uas_proximity_event_get_timestamp(ev),
-                         .0, .0, .0,
-                         uas_proximity_event_get_distance(ev),
-                         ctx});
-        }, NULL);
-
-    usleep(350000);
-    EXPECT_EQ(3, events.size());
-
-    auto e = events.front();
-    events.pop();
-    EXPECT_EQ(e.distance, U_PROXIMITY_NEAR);
-    EXPECT_EQ(NULL, e.context);
-    auto event_time = time_point_system_ns(std::chrono::nanoseconds(e.timestamp));
-    auto delay = chrono::duration_cast<chrono::milliseconds>(event_time - start_time).count();
-    EXPECT_GE(delay, 30);
-    EXPECT_LE(delay, 70);
-
-    e = events.front();
-    events.pop();
-    EXPECT_EQ(e.distance, U_PROXIMITY_FAR);
-    event_time = time_point_system_ns(std::chrono::nanoseconds(e.timestamp));
-    delay = chrono::duration_cast<chrono::milliseconds>(event_time - start_time).count();
-    EXPECT_GE(delay, 130);
-    EXPECT_LE(delay, 170);
-
-    e = events.front();
-    events.pop();
-    EXPECT_EQ(e.distance, (UASProximityDistance) 0);
-    event_time = time_point_system_ns(std::chrono::nanoseconds(e.timestamp));
-    delay = chrono::duration_cast<chrono::milliseconds>(event_time - start_time).count();
-    EXPECT_GE(delay, 210);
-    EXPECT_LE(delay, 250);
-})
-
-TESTP_F(APITest, LightEvents, {
-    set_data(" create  light  0 10 1\n"
-             "1 light 5\n"
-             "100 light 8\n"
-    );
-
-    UASensorsLight *s = ua_sensors_light_new();
-    EXPECT_TRUE(s != NULL);
-    ua_sensors_light_enable(s);
-    auto start_time = chrono::system_clock::now();
-
-    ua_sensors_light_set_reading_cb(s,
-        [](UASLightEvent* ev, void* ctx) {
-            events.push({uas_light_event_get_timestamp(ev),
-                         uas_light_event_get_light(ev), .0, .0,
-                         (UASProximityDistance) 0, ctx});
-        }, NULL);
-
-    usleep(130000);
-    EXPECT_EQ(2, events.size());
-
-    auto e = events.front();
-    events.pop();
-    EXPECT_FLOAT_EQ(e.x, 5);
-    EXPECT_EQ(NULL, e.context);
-    auto event_time = time_point_system_ns(std::chrono::nanoseconds(e.timestamp));
-    auto delay = chrono::duration_cast<chrono::milliseconds>(event_time - start_time).count();
-    EXPECT_LE(delay, 10);
-
-    e = events.front();
-    events.pop();
-    EXPECT_FLOAT_EQ(e.x, 8);
-    event_time = time_point_system_ns(std::chrono::nanoseconds(e.timestamp));
-    delay = chrono::duration_cast<chrono::milliseconds>(event_time - start_time).count();
-    EXPECT_GE(delay, 91);
-    EXPECT_LE(delay, 111);
-})
-
-TESTP_F(APITest, AccelEvents, {
-    // cover the case of > 1 s, to ensure that we correctly do mod arithmetic
-    set_data("create accel -1000 1000 0.1\n"
-             "1100 accel 5.5 -8.5 9.9\n"
-    );
-
-    UASensorsAccelerometer *s = ua_sensors_accelerometer_new();
-    EXPECT_TRUE(s != NULL);
-    ua_sensors_accelerometer_enable(s);
-    auto start_time = chrono::system_clock::now();
-
-    ua_sensors_accelerometer_set_reading_cb(s,
-        [](UASAccelerometerEvent* ev, void* ctx) {
-            events.push({uas_accelerometer_event_get_timestamp(ev),
-                         uas_accelerometer_event_get_acceleration_x(ev),
-                         uas_accelerometer_event_get_acceleration_y(ev),
-                         uas_accelerometer_event_get_acceleration_z(ev),
-                         (UASProximityDistance) 0, ctx});
-        }, NULL);
-
-    usleep(1200000);
-    EXPECT_EQ(1, events.size());
-
-    auto e = events.front();
-    events.pop();
-    EXPECT_FLOAT_EQ(e.x, 5.5);
-    EXPECT_FLOAT_EQ(e.y, -8.5);
-    EXPECT_FLOAT_EQ(e.z, 9.9);
-    EXPECT_EQ(NULL, e.context);
-    auto event_time = time_point_system_ns(std::chrono::nanoseconds(e.timestamp));
-    auto delay = chrono::duration_cast<chrono::milliseconds>(event_time - start_time).count();
-    EXPECT_GE(delay, 1050);
-    EXPECT_LE(delay, 1150);
-})