[9.0][location] Remove conditional statements for Mobile/Wearable profile

[platform/core/api/location-manager.git] / src / location_internal.c

diff --git a/src/location_internal.c b/src/location_internal.c
index 0ad81f5..ede0a44 100644 (file)
--- a/src/location_internal.c
+++ b/src/location_internal.c
@@ -149,15 +149,28 @@ int __is_batch_supported(void)
 int __is_fused_supported(void)
 {
        bool is_supported = false;
+       bool is_accelerometer = false;
+       bool is_gyroscope = false;
        int retval = 0;
 
        retval = system_info_get_platform_bool("http://tizen.org/feature/location.fused", &is_supported);
        if (retval != SYSTEM_INFO_ERROR_NONE)
                LOCATIONS_LOGW("system_info_get_platform_bool failed: retval = %d", retval);
-
        if (is_supported == false)
                return LOCATIONS_ERROR_NOT_SUPPORTED;
 
+       retval = system_info_get_platform_bool("http://tizen.org/feature/sensor.accelerometer", &is_accelerometer);
+       if (retval != SYSTEM_INFO_ERROR_NONE)
+               LOCATIONS_LOGW("system_info_get_platform_bool failed: retval = %d", retval);
+       if (is_accelerometer == false)
+               return LOCATIONS_ERROR_NOT_SUPPORTED;
+
+       retval = system_info_get_platform_bool("http://tizen.org/feature/sensor.gyroscope", &is_gyroscope);
+       if (retval != SYSTEM_INFO_ERROR_NONE)
+               LOCATIONS_LOGW("system_info_get_platform_bool failed: retval = %d", retval);
+       if (is_gyroscope == false)
+               return LOCATIONS_ERROR_NOT_SUPPORTED;
+
        return LOCATIONS_ERROR_NONE;    //LCOV_EXCL_LINE
 }
 
@@ -166,8 +179,12 @@ int __set_callback(_location_event_e type, location_manager_h manager, void *cal
        LOCATIONS_NULL_ARG_CHECK(manager);
        LOCATIONS_NULL_ARG_CHECK(callback);
        location_manager_s *handle = (location_manager_s *) manager;
-       handle->user_cb[type] = callback;
-       handle->user_data[type] = user_data;
+       if (handle != NULL){
+               handle->user_cb[type] = callback;
+               handle->user_data[type] = user_data;
+       }
+       else
+               LOCATIONS_LOGE("Null Handle");
        LOCATIONS_LOGD("event type : %d", type);
        return LOCATIONS_ERROR_NONE;
 }
@@ -176,8 +193,12 @@ int __unset_callback(_location_event_e type, location_manager_h manager)
 {
        LOCATIONS_NULL_ARG_CHECK(manager);
        location_manager_s *handle = (location_manager_s *) manager;
-       handle->user_cb[type] = NULL;
-       handle->user_data[type] = NULL;
+       if (handle != NULL){
+               handle->user_cb[type] = NULL;
+               handle->user_data[type] = NULL;
+       }
+       else
+               LOCATIONS_LOGE("Null Handle");
        LOCATIONS_LOGD("event type : %d", type);
        return LOCATIONS_ERROR_NONE;
 }