Remove deprecated enum values

Change-Id: I4c8e78a4a99f3ee1d0a35d86ae603b3462e1b348
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/include/runtime_info.h b/include/runtime_info.h
index 4a3b07a..cdff291 100644 (file)
--- a/include/runtime_info.h
+++ b/include/runtime_info.h
@@ -56,8 +56,6 @@ typedef enum {
        RUNTIME_INFO_KEY_WIFI_HOTSPOT_ENABLED = 3,              /**<Indicates whether Wi-Fi hotspot is enabled. */
        RUNTIME_INFO_KEY_BLUETOOTH_TETHERING_ENABLED = 4,       /**<Indicates whether Bluetooth tethering is enabled. */
        RUNTIME_INFO_KEY_USB_TETHERING_ENABLED = 5,             /**<Indicates whether USB tethering is enabled. */
-       RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED = 6,          /**<Indicates whether the location service is allowed to use location data from GPS satellites. (Deprecated since 4.0) */
-       RUNTIME_INFO_KEY_LOCATION_NETWORK_POSITION_ENABLED = 8, /**<Indicates whether the location service is allowed to use location data from cellular and Wi-Fi. (Deprecated since 4.0) */
        RUNTIME_INFO_KEY_PACKET_DATA_ENABLED = 9,               /**<Indicates Whether the packet data through 3G network is enabled. */
        RUNTIME_INFO_KEY_DATA_ROAMING_ENABLED = 10,             /**<Indicates whether data roaming is enabled. */
        RUNTIME_INFO_KEY_VIBRATION_ENABLED = 12,                /**<Indicates whether vibration is enabled. */

diff --git a/src/runtime_info.c b/src/runtime_info.c
index e654397..db45f4b 100644 (file)
--- a/src/runtime_info.c
+++ b/src/runtime_info.c
@@ -99,24 +99,6 @@ runtime_info_item_s runtime_info_item_table[] = {
 },
 
 {
-       RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED, /**<Indicates whether the location service is allowed to use location data from GPS satellites. */
-       RUNTIME_INFO_DATA_TYPE_BOOL,
-       runtime_info_location_service_get_value,
-       runtime_info_location_service_set_event_cb,
-       runtime_info_location_service_unset_event_cb,
-       NULL
-},
-
-{
-       RUNTIME_INFO_KEY_LOCATION_NETWORK_POSITION_ENABLED, /**<Indicates whether the location service is allowed to use location data from cellular and Wi-Fi. */
-       RUNTIME_INFO_DATA_TYPE_BOOL,
-       runtime_info_location_network_get_value,
-       runtime_info_location_network_set_event_cb,
-       runtime_info_location_network_unset_event_cb,
-       NULL
-},
-
-{
        RUNTIME_INFO_KEY_PACKET_DATA_ENABLED, /**<Indicates Whether the packet data through 3G network is enabled. */
        RUNTIME_INFO_DATA_TYPE_BOOL,
        runtime_info_packet_data_get_value,

diff --git a/src/runtime_info_location.c b/src/runtime_info_location.c
deleted file mode 100644 (file)
index 3acddf7..0000000
--- a/src/runtime_info_location.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <vconf.h>
-#include <dlog.h>
-
-#include <runtime_info.h>
-#include <runtime_info_private.h>
-
-#ifdef LOG_TAG
-#undef LOG_TAG
-#endif
-
-#define LOG_TAG "CAPI_SYSTEM_RUNTIME_INFO"
-
-static const char *VCONF_LOCATION_SERVICE_ENABLED = VCONFKEY_LOCATION_ENABLED;
-static const char *VCONF_LOCATION_NETWORK_ENABLED = VCONFKEY_LOCATION_NETWORK_ENABLED;
-
-//LCOV_EXCL_START : deprecated feature
-int runtime_info_location_service_get_value(runtime_info_value_h value)
-{
-       int vconf_value;
-       int ret;
-
-       LOGW("DEPRECATION WARNING: RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED is deprecated and will be removed from next release.");
-
-       RETURN_ERROR_IF_NOT_SUPPORTED("http://tizen.org/feature/location");
-
-       ret = runtime_info_vconf_get_value_int(VCONF_LOCATION_SERVICE_ENABLED, &vconf_value);
-       if (ret == RUNTIME_INFO_ERROR_NONE)
-               value->b = vconf_value;
-
-       return ret;
-}
-
-int runtime_info_location_service_set_event_cb()
-{
-       LOGW("DEPRECATION WARNING: RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED is deprecated and will be removed from next release.");
-
-       return runtime_info_vconf_set_event_cb(VCONF_LOCATION_SERVICE_ENABLED, RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED, 0);
-}
-
-void runtime_info_location_service_unset_event_cb()
-{
-       LOGW("DEPRECATION WARNING: RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED is deprecated and will be removed from next release.");
-
-       runtime_info_vconf_unset_event_cb(VCONF_LOCATION_SERVICE_ENABLED, 0);
-}
-
-int runtime_info_location_network_get_value(runtime_info_value_h value)
-{
-       int vconf_value;
-       int ret;
-
-       LOGW("DEPRECATION WARNING: RUNTIME_INFO_KEY_LOCATION_NETWORK_POSITION_ENABLED is deprecated and will be removed from next release.");
-
-       RETURN_ERROR_IF_NOT_SUPPORTED("http://tizen.org/feature/location.wps");
-
-       ret = runtime_info_vconf_get_value_int(VCONF_LOCATION_NETWORK_ENABLED, &vconf_value);
-       if (ret == RUNTIME_INFO_ERROR_NONE)
-               value->b = vconf_value;
-
-       return ret;
-}
-
-int runtime_info_location_network_set_event_cb()
-{
-       LOGW("DEPRECATION WARNING: RUNTIME_INFO_KEY_LOCATION_NETWORK_POSITION_ENABLED is deprecated and will be removed from next release.");
-
-       return runtime_info_vconf_set_event_cb(VCONF_LOCATION_NETWORK_ENABLED, RUNTIME_INFO_KEY_LOCATION_NETWORK_POSITION_ENABLED, 0);
-}
-
-void runtime_info_location_network_unset_event_cb()
-{
-       LOGW("DEPRECATION WARNING: RUNTIME_INFO_KEY_LOCATION_NETWORK_POSITION_ENABLED is deprecated and will be removed from next release.");
-
-       runtime_info_vconf_unset_event_cb(VCONF_LOCATION_NETWORK_ENABLED, 0);
-}
-//LCOV_EXCL_STOP