tizen 2.3.1 release

[framework/api/runtime-info.git] / src / runtime_info_connectivity.c

diff --git a/src/runtime_info_connectivity.c b/src/runtime_info_connectivity.c
old mode 100755 (executable)
new mode 100644 (file)
index d474428..25205ea
--- a/src/runtime_info_connectivity.c
+++ b/src/runtime_info_connectivity.c
@@ -11,7 +11,7 @@
  * 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. 
+ * limitations under the License.
  */
 
 #include <stdio.h>
@@ -28,7 +28,7 @@
 #undef LOG_TAG
 #endif
 
-#define LOG_TAG "TIZEN_N_RUNTIME_INFO"
+#define LOG_TAG "CAPI_SYSTEM_RUNTIME_INFO"
 
 static const char *VCONF_WIFI_STATUS = VCONFKEY_WIFI_STATE;
 static const char *VCONF_BT_ENABLED = VCONFKEY_BT_STATUS;
@@ -36,20 +36,19 @@ static const char *VCONF_WIFI_HOTSPOT_ENABLED = VCONFKEY_MOBILE_HOTSPOT_MODE;
 static const char *VCONF_BT_HOTSPOT_ENABLED = VCONFKEY_MOBILE_HOTSPOT_MODE;
 static const char *VCONF_USB_HOTSPOT_ENABLED = VCONFKEY_MOBILE_HOTSPOT_MODE;
 static const char *VCONF_PACKET_DATA_ENABLED = VCONFKEY_3G_ENABLE;
-static const char *VCONF_DATA_ROAMING_ENABLED = "db/setting/data_roaming";
+static const char *VCONF_DATA_ROAMING_ENABLED = VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL;
 static const char *VCONF_GPS_STATUS = VCONFKEY_LOCATION_GPS_STATE;
 
 int runtime_info_wifi_status_get_value(runtime_info_value_h value)
 {
        int vconf_value;
-       
-       if (runtime_info_vconf_get_value_int(VCONF_WIFI_STATUS, &vconf_value))
-       {
-               return RUNTIME_INFO_ERROR_IO_ERROR;
-       }
+       int ret;
 
-       switch (vconf_value)
-       {
+       ret = runtime_info_vconf_get_value_int(VCONF_WIFI_STATUS, &vconf_value);
+       if (ret != RUNTIME_INFO_ERROR_NONE)
+               return ret;
+
+       switch (vconf_value) {
        case VCONFKEY_WIFI_OFF:
                value->i = RUNTIME_INFO_WIFI_STATUS_DISABLED;
                break;
@@ -61,13 +60,13 @@ int runtime_info_wifi_status_get_value(runtime_info_value_h value)
        case VCONFKEY_WIFI_CONNECTED:
        case VCONFKEY_WIFI_TRANSFER:
                value->i = RUNTIME_INFO_WIFI_STATUS_CONNECTED;
-               break;  
-       
+               break;
+
        default:
                return RUNTIME_INFO_ERROR_IO_ERROR;
        }
 
-       return RUNTIME_INFO_ERROR_NONE;
+       return ret;
 }
 
 int runtime_info_wifi_status_set_event_cb()
@@ -75,7 +74,7 @@ int runtime_info_wifi_status_set_event_cb()
        return runtime_info_vconf_set_event_cb(VCONF_WIFI_STATUS, RUNTIME_INFO_KEY_WIFI_STATUS, 0);
 }
 
-void runtime_info_wifi_status_unset_event_cb ()
+void runtime_info_wifi_status_unset_event_cb()
 {
        runtime_info_vconf_unset_event_cb(VCONF_WIFI_STATUS, 0);
 }
@@ -83,14 +82,13 @@ void runtime_info_wifi_status_unset_event_cb ()
 int runtime_info_bt_enabled_get_value(runtime_info_value_h value)
 {
        int vconf_value;
-       
-       if (runtime_info_vconf_get_value_int(VCONF_BT_ENABLED, &vconf_value))
-       {
-               return RUNTIME_INFO_ERROR_IO_ERROR;
-       }
+       int ret;
 
-       switch (vconf_value)
-       {
+       ret = runtime_info_vconf_get_value_int(VCONF_BT_ENABLED, &vconf_value);
+       if (ret != RUNTIME_INFO_ERROR_NONE)
+               return ret;
+
+       switch (vconf_value) {
        case VCONFKEY_BT_STATUS_OFF:
                value->b = false;
                break;
@@ -99,13 +97,13 @@ int runtime_info_bt_enabled_get_value(runtime_info_value_h value)
        case VCONFKEY_BT_STATUS_BT_VISIBLE:
        case VCONFKEY_BT_STATUS_TRANSFER:
                value->b = true;
-               break;  
-       
+               break;
+
        default:
                return RUNTIME_INFO_ERROR_IO_ERROR;
        }
 
-       return RUNTIME_INFO_ERROR_NONE;
+       return ret;
 }
 
 int runtime_info_bt_enabled_set_event_cb()
@@ -113,7 +111,7 @@ int runtime_info_bt_enabled_set_event_cb()
        return runtime_info_vconf_set_event_cb(VCONF_BT_ENABLED, RUNTIME_INFO_KEY_BLUETOOTH_ENABLED, 0);
 }
 
-void runtime_info_bt_enabled_unset_event_cb ()
+void runtime_info_bt_enabled_unset_event_cb()
 {
        runtime_info_vconf_unset_event_cb(VCONF_BT_ENABLED, 0);
 }
@@ -122,15 +120,13 @@ void runtime_info_bt_enabled_unset_event_cb ()
 int runtime_info_wifi_hotspot_get_value(runtime_info_value_h value)
 {
        int vconf_value;
-       
-       if (runtime_info_vconf_get_value_int(VCONF_WIFI_HOTSPOT_ENABLED, &vconf_value))
-       {
-               return RUNTIME_INFO_ERROR_IO_ERROR;
-       }
+       int ret;
 
-       value->b = (vconf_value&VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI) ? true : false;
+       ret = runtime_info_vconf_get_value_int(VCONF_WIFI_HOTSPOT_ENABLED, &vconf_value);
+       if (ret == RUNTIME_INFO_ERROR_NONE)
+               value->b = (vconf_value&VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI) ? true : false;
 
-       return RUNTIME_INFO_ERROR_NONE;
+       return ret;
 }
 
 int runtime_info_wifi_hotspot_set_event_cb()
@@ -146,15 +142,13 @@ void runtime_info_wifi_hotspot_unset_event_cb()
 int runtime_info_bt_hotspot_get_value(runtime_info_value_h value)
 {
        int vconf_value;
-       
-       if (runtime_info_vconf_get_value_int(VCONF_BT_HOTSPOT_ENABLED, &vconf_value))
-       {
-               return RUNTIME_INFO_ERROR_IO_ERROR;
-       }
+       int ret;
 
-       value->b = (vconf_value&VCONFKEY_MOBILE_HOTSPOT_MODE_BT) ? true : false;
+       ret = runtime_info_vconf_get_value_int(VCONF_BT_HOTSPOT_ENABLED, &vconf_value);
+       if (ret == RUNTIME_INFO_ERROR_NONE)
+               value->b = (vconf_value&VCONFKEY_MOBILE_HOTSPOT_MODE_BT) ? true : false;
 
-       return RUNTIME_INFO_ERROR_NONE;
+       return ret;
 }
 
 int runtime_info_bt_hotspot_set_event_cb()
@@ -170,15 +164,13 @@ void runtime_info_bt_hotspot_unset_event_cb()
 int runtime_info_usb_hotspot_get_value(runtime_info_value_h value)
 {
        int vconf_value;
-       
-       if (runtime_info_vconf_get_value_int(VCONF_USB_HOTSPOT_ENABLED, &vconf_value))
-       {
-               return RUNTIME_INFO_ERROR_IO_ERROR;
-       }
+       int ret;
 
-       value->b = (vconf_value&VCONFKEY_MOBILE_HOTSPOT_MODE_USB) ? true : false;
+       ret = runtime_info_vconf_get_value_int(VCONF_USB_HOTSPOT_ENABLED, &vconf_value);
+       if (ret == RUNTIME_INFO_ERROR_NONE)
+               value->b = (vconf_value&VCONFKEY_MOBILE_HOTSPOT_MODE_USB) ? true : false;
 
-       return RUNTIME_INFO_ERROR_NONE;
+       return ret;
 }
 
 int runtime_info_usb_hotspot_set_event_cb()
@@ -193,16 +185,14 @@ void runtime_info_usb_hotspot_unset_event_cb()
 
 int runtime_info_packet_data_get_value(runtime_info_value_h value)
 {
-       bool vconf_value;
-       
-       if (runtime_info_vconf_get_value_bool(VCONF_PACKET_DATA_ENABLED, &vconf_value))
-       {
-               return RUNTIME_INFO_ERROR_IO_ERROR;
-       }
+       int vconf_value;
+       int ret;
 
-       value->b = vconf_value;
+       ret = runtime_info_vconf_get_value_bool(VCONF_PACKET_DATA_ENABLED, &vconf_value);
+       if (ret == RUNTIME_INFO_ERROR_NONE)
+               value->b = (bool)vconf_value;
 
-       return RUNTIME_INFO_ERROR_NONE;
+       return ret;
 }
 
 int runtime_info_packet_data_set_event_cb()
@@ -217,16 +207,14 @@ void runtime_info_packet_data_unset_event_cb()
 
 int runtime_info_data_roaming_get_value(runtime_info_value_h value)
 {
-       bool vconf_value;
-       
-       if (runtime_info_vconf_get_value_bool(VCONF_DATA_ROAMING_ENABLED, &vconf_value))
-       {
-               return RUNTIME_INFO_ERROR_IO_ERROR;
-       }
+       int vconf_value;
+       int ret;
 
-       value->b = vconf_value;
+       ret = runtime_info_vconf_get_value_bool(VCONF_DATA_ROAMING_ENABLED, &vconf_value);
+       if (ret == RUNTIME_INFO_ERROR_NONE)
+               value->b = (bool)vconf_value;
 
-       return RUNTIME_INFO_ERROR_NONE;
+       return ret;
 }
 
 int runtime_info_data_roaming_set_event_cb()
@@ -242,14 +230,13 @@ void runtime_info_data_roaming_unset_event_cb()
 int runtime_info_gps_status_get_value(runtime_info_value_h value)
 {
        int vconf_value;
-       
-       if (runtime_info_vconf_get_value_int(VCONF_GPS_STATUS, &vconf_value))
-       {
-               return RUNTIME_INFO_ERROR_IO_ERROR;
-       }
+       int ret;
+
+       ret = runtime_info_vconf_get_value_int(VCONF_GPS_STATUS, &vconf_value);
+       if (ret != RUNTIME_INFO_ERROR_NONE)
+               return ret;
 
-       switch (vconf_value)
-       {
+       switch (vconf_value) {
        case VCONFKEY_LOCATION_GPS_OFF:
                value->i = RUNTIME_INFO_GPS_STATUS_DISABLED;
                break;
@@ -261,12 +248,12 @@ int runtime_info_gps_status_get_value(runtime_info_value_h value)
        case VCONFKEY_LOCATION_GPS_CONNECTED:
                value->i = RUNTIME_INFO_GPS_STATUS_CONNECTED;
                break;
-       
+
        default:
                return RUNTIME_INFO_ERROR_IO_ERROR;
        }
 
-       return RUNTIME_INFO_ERROR_NONE;
+       return ret;
 }
 
 int runtime_info_gps_status_set_event_cb()