From: Injun Yang <injun.yang@samsung.com>
Date: Fri, 7 Sep 2012 15:34:00 +0000 (+0900)
Subject: Fix the termination issue
X-Git-Tag: 2.0_alpha^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;p=platform%2Fcore%2Fconnectivity%2Fdata-router.git

Fix the termination issue

Issue : data-router is not terminated
Cause : Undefined vconf key used
Fix description
- Change vconf key
- Remove unused vconf key

Change-Id: I00b1dd9fd02cb8a5c11eb52089bf2597c9febc2a
---

diff --git a/debian/changelog b/debian/changelog
index aa9b325..80997ee 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+data-router (0.2.14) unstable; urgency=low
+
+  * Upload the package
+  * Git: slp/pkgs/d/data-router
+  * Tag: data-router_0.2.14
+
+ -- InJun Yang <injun.yang@samsung.com>  Sat, 08 Sep 2012 00:10:56 +0900
+
 data-router (0.2.13) unstable; urgency=low
 
   * Remove libdata-router package
diff --git a/packaging/data-router.spec b/packaging/data-router.spec
index ab3dd5c..cbcd1dd 100644
--- a/packaging/data-router.spec
+++ b/packaging/data-router.spec
@@ -1,6 +1,6 @@
 Name:       data-router
 Summary:    Data Router
-Version:    0.2.13
+Version:    0.2.14
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
@@ -29,7 +29,7 @@ rm -rf %{buildroot}
 
 
 %post
-/usr/bin/vconftool set -t int memory/data_router/osp_serial_open "0" -i
+/usr/bin/vconftool set -t int memory/data_router/osp_serial_open "0" -u 0 -i -f
 %postun
 
 
diff --git a/src/dr-noti-handler.c b/src/dr-noti-handler.c
index 5b6cd03..4429a1f 100644
--- a/src/dr-noti-handler.c
+++ b/src/dr-noti-handler.c
@@ -46,14 +46,13 @@ static void __usb_noti_handler(void *data)
 	int usb_state = -1;
 	int usb_mode = -1;
 	int ret;
-	int mobileap_mode;
 
 	if (_get_usb_state(&usb_state) < 0) {
 		ERR(" Unable to get usb status !\n");
 		return;
 	}
 
-	ret = vconf_get_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, &usb_mode);
+	ret = vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT, &usb_mode);
 	if (ret != 0) {
 		DBG("Vconf get failed\n");
 		return;
@@ -62,16 +61,6 @@ static void __usb_noti_handler(void *data)
 	DBG("USB noti handler, USB state : %d, Mode : %d\n", usb_state, usb_mode);
 	DBG("usb_fd = 0x%x\n", dr_info.usb.usb_fd);
 
-	ret = vconf_get_int(VCONFKEY_MOBILE_HOTSPOT_MODE, &mobileap_mode);
-	if (ret != 0) {
-		DBG("Vconf get failed\n");
-		return;
-	}
-
-	if (mobileap_mode & VCONFKEY_MOBILE_HOTSPOT_MODE_USB) {
-		DBG("MobileAP_USB enabled. Do not initialize USB\n");
-		return;
-	}
 
 	/*
 	 * If USB driver builted in the Kernel, VCONFKEY_SYSMAN_USB_CONNECTED is not used.
@@ -95,7 +84,7 @@ static void __usb_mode_noti_handler(void *data)
 	int usb_mode = -1;
 	int ret;
 
-	ret = vconf_get_int(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, &usb_mode);
+	ret = vconf_get_int(VCONFKEY_SETAPPL_USB_MODE_INT, &usb_mode);
 	if (ret != 0) {
 		DBG("Vconf get failed\n");
 		return;
@@ -135,10 +124,10 @@ gboolean _register_vconf_notification(void)
 	}
 
 	ret =
-	    vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_SEL_MODE_INT,
+	    vconf_notify_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT,
 				     (vconf_callback_fn) __usb_mode_noti_handler, NULL);
 	if (ret < 0) {
-		ERR("Error !!! VCONFKEY reg noti  : %s\n", VCONFKEY_SETAPPL_USB_SEL_MODE_INT);
+		ERR("Error !!! VCONFKEY reg noti  : %s\n", VCONFKEY_SETAPPL_USB_MODE_INT);
 	}
 
 	return TRUE;
@@ -147,7 +136,7 @@ gboolean _register_vconf_notification(void)
 void _unregister_vconf_notification(void)
 {
 	vconf_ignore_key_changed(VCONFKEY_SYSMAN_USB_STATUS, (vconf_callback_fn) __usb_noti_handler);
-	vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_SEL_MODE_INT, (vconf_callback_fn) __usb_mode_noti_handler);
+	vconf_ignore_key_changed(VCONFKEY_SETAPPL_USB_MODE_INT, (vconf_callback_fn) __usb_mode_noti_handler);
 	return;
 }