ilmControl,tests: remove ilm_layerSetPosition API

it is a unnecessary API. ilm_layerSetDestinationRectangle can be used instead.

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>

3 files changed, 0 insertions, 55 deletions

diff --git a/ivi-layermanagement-api/ilmControl/include/ilm_control.h b/ivi-layermanagement-api/ilmControl/include/ilm_control.h
index e44a67b..c6cb57b 100644
--- a/ivi-layermanagement-api/ilmControl/include/ilm_control.h
+++ b/ivi-layermanagement-api/ilmControl/include/ilm_control.h
@@ -241,17 +241,6 @@ ilmErrorTypes ilm_layerSetSourceRectangle(t_ilm_layer layerId, t_ilm_uint x, t_i
 ilmErrorTypes ilm_layerSetDestinationRectangle(t_ilm_layer layerId, t_ilm_int x, t_ilm_int y, t_ilm_int width, t_ilm_int height);
 
 /**
- * \brief Sets the horizontal and vertical position of the layer.
- * \ingroup ilmControl
- * \param[in] layerId Id of layer.
- * \param[in] pPosition pointer to an array where the position is stored.
- *                      dimension[0]=x, dimension[1]=y
- * \return ILM_SUCCESS if the method call was successful
- * \return ILM_FAILED if the client can not call the method on the service.
- */
-ilmErrorTypes ilm_layerSetPosition(t_ilm_layer layerId, t_ilm_uint *pPosition);
-
-/**
  * \brief Sets the orientation of a layer.
  * \ingroup ilmControl
  * \param[in] layerId Id of layer.
diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
index 4f66648..5c3a49d 100644
--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
@@ -1933,30 +1933,6 @@ ilm_layerSetDestinationRectangle(t_ilm_layer layerId,
 }
 
 ILM_EXPORT ilmErrorTypes
-ilm_layerSetPosition(t_ilm_layer layerId, t_ilm_uint *pPosition)
-{
-    ilmErrorTypes returnValue = ILM_FAILED;
-    struct ilm_control_context *ctx = sync_and_acquire_instance();
-    struct layer_context *ctx_layer = NULL;
-
-    if (pPosition != NULL) {
-        ctx_layer = (struct layer_context*)
-                    wayland_controller_get_layer_context(
-                        &ctx->wl, (uint32_t)layerId);
-        if (ctx_layer != NULL) {
-            ivi_controller_layer_set_destination_rectangle(
-                ctx_layer->controller,
-                (int32_t)*pPosition, (int32_t)*(pPosition + 1),
-                ctx_layer->prop.destWidth, ctx_layer->prop.destHeight);
-            returnValue = ILM_SUCCESS;
-        }
-    }
-
-    release_instance();
-    return returnValue;
-}
-
-ILM_EXPORT ilmErrorTypes
 ilm_layerSetOrientation(t_ilm_layer layerId, ilmOrientation orientation)
 {
     ilmErrorTypes returnValue = ILM_FAILED;
diff --git a/ivi-layermanagement-api/test/ilm_control_notification_test.cpp b/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
index f501e61..f3ada3b 100644
--- a/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
+++ b/ivi-layermanagement-api/test/ilm_control_notification_test.cpp
@@ -295,26 +295,6 @@ TEST_F(NotificationTest, ilm_surfaceAddNotificationWithoutCallback)
     ilm_commitChanges();
 }
 
-// ######### LAYERS
-TEST_F(NotificationTest, NotifyOnLayerSetPosition)
-{
-    ASSERT_EQ(ILM_SUCCESS,ilm_layerAddNotification(layer,&LayerCallbackFunction));
-    // change something
-    t_ilm_uint pos[] = { 7, 2 };
-    ilm_layerSetPosition(layer,pos);
-    ilm_commitChanges();
-
-    // expect callback to have been called
-    assertCallbackcalled();
-
-    EXPECT_EQ(layer,callbackLayerId);
-    EXPECT_EQ(7u,LayerProperties.destX);
-    EXPECT_EQ(2u,LayerProperties.destY);
-    EXPECT_EQ(ILM_NOTIFICATION_DEST_RECT,mask);
-
-    ASSERT_EQ(ILM_SUCCESS,ilm_layerRemoveNotification(layer));
-}
-
 TEST_F(NotificationTest, NotifyOnLayerSetDestinationRectangle)
 {
     ASSERT_EQ(ILM_SUCCESS,ilm_layerAddNotification(layer,&LayerCallbackFunction));