[TSAM-9983] Change vconf key for checking usb status

Change-Id: I69ddabe615bba6208b0fb1fd465af27e9c25b665
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/packaging/mobileap-agent.spec b/packaging/mobileap-agent.spec
index 276262f..012a801 100644 (file)
--- a/packaging/mobileap-agent.spec
+++ b/packaging/mobileap-agent.spec
@@ -68,6 +68,7 @@ cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system-services/org.tizen.MobileapA
 
 %post
 /bin/chmod +x /opt/etc/dump.d/module.d/tethering_dump.sh
+/usr/sbin/setcap cap_dac_override,cap_fowner,cap_net_bind_service,cap_net_admin+eip /usr/bin/mobileap-agent
 
 %files
 %manifest mobileap-agent.manifest

diff --git a/src/mobileap_usb.c b/src/mobileap_usb.c
index 446239a..03da151 100755 (executable)
--- a/src/mobileap_usb.c
+++ b/src/mobileap_usb.c
@@ -162,16 +162,8 @@ static void __handle_usb_disconnect_cb(keynode_t *key, void *data)
        }
        SDBG("key = %s, value = %d(int)\n", vconf_name, vconf_key);
 
-       /*
-        * P140305-02551: Disconnected State is implemented from DBUS instead of
-        * VCONF key.
-        */
-       if (usb_client_state == USBCLIENT_STATE_DISCONNECTED)
-               DBG("USB is disconnected\n");
-       else if (vconf_name && !strcmp(vconf_name, VCONFKEY_USB_CUR_MODE) &&
-                       (vconf_key != SET_USB_RNDIS))
-               SDBG("USB Mode is changed [%d]\n", vconf_key);
-       else
+       usb_client_state = vconf_key;
+       if (usb_client_state != USBCLIENT_STATE_DISCONNECTED)
                return;
 
        _disable_usb_tethering(obj);
@@ -220,8 +212,9 @@ static void __handle_usb_mode_change(keynode_t *key, void *data)
                                __handle_usb_mode_change);
 
                /* USB Mode change is handled while USB tethering is enabled */
-               vconf_notify_key_changed(VCONFKEY_USB_CUR_MODE,
+               vconf_notify_key_changed(VCONFKEY_SYSMAN_USB_STATUS,
                                __handle_usb_disconnect_cb, (void *)obj);
+
                ret = vconf_get_int(VCONFKEY_USB_CUR_MODE, &vconf_key);
                if (ret != 0)
                        ERR("vconf_get_int is failed. but ignored [%d]\n", ret);
@@ -362,7 +355,7 @@ mobile_ap_error_code_e _disable_usb_tethering(Tethering *obj)
                conn = NULL;
        }
 
-       vconf_ignore_key_changed(VCONFKEY_USB_CUR_MODE,
+       vconf_ignore_key_changed(VCONFKEY_SYSMAN_USB_STATUS,
                        __handle_usb_disconnect_cb);
 
        _mobileap_clear_state(MOBILE_AP_STATE_USB);