Reset disconnect timer for the incoming connection

Change-Id: Id3bc0c4a188b0d93478297c711856f1be47645fe
Signed-off-by: Dohyun Pyun <dh79.pyun@samsung.com>

diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 5ae4501..cd3c50e 100644 (file)
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -1571,7 +1571,7 @@ static void set_disconnect_timer_for_sink(struct avdtp *session, gboolean discon
        device_get_name(session->device, name, sizeof(name));
        DBG("name : [%s]", name);
        if (g_str_equal(name, "VW BT") || g_str_equal(name, "VW MI") ||
-                                               g_str_equal(name, "Seat ")) {
+                g_str_equal(name, "Seat ") || g_str_equal(name, "Galax")) {
                session->dc_timer = g_timeout_add_seconds(3, disconnect_timeout,
                                session);
        } else if (g_str_equal(name, "CAR M")) {
@@ -1593,16 +1593,20 @@ static void set_disconnect_timer_for_sink(struct avdtp *session, gboolean discon
 static void set_disconnect_timer(struct avdtp *session)
 {
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-       char name[6];
-#endif
+       if (session->dc_timer)
+               remove_disconnect_timer(session);
+#else
        /* Take a ref while disconnect timer is active */
        avdtp_ref(session);
+#endif
 
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       char name[6];
+
        device_get_name(session->device, name, sizeof(name));
        DBG("name : [%s]", name);
        if (g_str_equal(name, "VW BT") || g_str_equal(name, "VW MI") ||
-                                               g_str_equal(name, "Seat ")) {
+                g_str_equal(name, "Seat ") || g_str_equal(name, "Galax")) {
                session->dc_timer = g_timeout_add_seconds(3, disconnect_timeout,
                                session);
        } else if (g_str_equal(name, "CAR M")) {