usb: exchange vconf key for the usb mode

- The vconf key VCONFKEY_SETAPPL_USB_MODE_INT is
  one of the legacy vconf keys. Thus is is exchanged
  to new one.

Change-Id: I3f274fb4d07112bfbfa7f7582fc76c86c0dea040
Signed-off-by: taeyoung <ty317.kim@samsung.com>

diff --git a/src/mtp_event_handler.c b/src/mtp_event_handler.c
index 2be6496..72c3f3f 100755 (executable)
--- a/src/mtp_event_handler.c
+++ b/src/mtp_event_handler.c
@@ -71,10 +71,10 @@ mtp_bool _eh_register_notification_callbacks(void)
 
        _util_get_usbmode_status(&val);
        _util_set_local_usbmode_status(val);
-       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT,
+       ret = vconf_notify_key_changed(VCONFKEY_USB_CUR_MODE,
                        __handle_usb_mode_notification, NULL);
        if (ret < 0) {
-               ERR("vconf_notify_key_changed(%s) Fail", VCONFKEY_SETAPPL_USB_MODE_INT);
+               ERR("vconf_notify_key_changed(%s) Fail", VCONFKEY_USB_CUR_MODE);
                return FALSE;
        }
 
@@ -397,7 +397,7 @@ void _eh_deregister_notification_callbacks(void)
 {
        vconf_ignore_key_changed(VCONFKEY_SYSMAN_USB_STATUS,
                        __handle_usb_notification);
-       vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT,
+       vconf_ignore_key_changed(VCONFKEY_USB_CUR_MODE,
                        __handle_usb_mode_notification);
 
        return;

diff --git a/src/util/mtp_util.c b/src/util/mtp_util.c
index 83731f1..4518a1f 100755 (executable)
--- a/src/util/mtp_util.c
+++ b/src/util/mtp_util.c
@@ -273,12 +273,17 @@ void _util_get_usbmode_status(phone_status_t *val)
        mtp_int32 ret = 0;
        mtp_int32 state = 0;
 
-       ret = vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT,
+       ret = vconf_get_int(VCONFKEY_USB_CUR_MODE,
                        &state);
-       if (ret < 0)
+       if (ret < 0) {
                *val = MTP_PHONE_USB_MODE_OTHER;
+               return;
+       }
+
+       if (state == SET_USB_NONE)
+               *val = MTP_PHONE_USB_DISCONNECTED;
        else
-               *val = state;
+               *val = MTP_PHONE_USB_CONNECTED;
        return;
 }