OSDN Git Service

android/AVDTP: Fix not calling callback if DISCOVER is rejected
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Thu, 28 Nov 2013 12:25:06 +0000 (14:25 +0200)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Thu, 5 Dec 2013 10:36:03 +0000 (12:36 +0200)
If DISCOVER command is rejected and a callback exists it should be
called with the reject error, this fixes test /TP/SIG/SMG/BI-01-C

android/avdtp.c

index ac08acd..3b605ae 100644 (file)
@@ -2559,6 +2559,12 @@ static gboolean avdtp_parse_rej(struct avdtp *session,
                        return FALSE;
                error("DISCOVER request rejected: %s (%d)",
                                avdtp_strerror(&err), err.err.error_code);
+               if (session->discover) {
+                       session->discover->cb(session, session->seps, &err,
+                                               session->discover->user_data);
+                       g_free(session->discover);
+                       session->discover = NULL;
+               }
                return TRUE;
        case AVDTP_GET_CAPABILITIES:
        case AVDTP_GET_ALL_CAPABILITIES: