summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2009-03-03 00:19:08 +0200
committerJohan Hedberg <johan.hedberg@nokia.com>2009-03-03 09:12:54 +0200
commita37210e15f8acc532d1955585b032c89256d8fb7 (patch)
tree8476e8940657cd862e94b8a4f759cc893f7c9c24 /audio
parent370d874dc420190c91a39a5e12cd0756d9a31d41 (diff)
Update HSP version to 1.2
Diffstat (limited to 'audio')
-rw-r--r--audio/headset.c5
-rw-r--r--audio/manager.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/audio/headset.c b/audio/headset.c
index 3b1b6772..716b33d3 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -2587,6 +2587,11 @@ int telephony_incoming_call_ind(const char *number, int type)
return -EBUSY;
}
+ /* With HSP 1.2 the RING messages should *not* be sent if inband
+ * ringtone is being used */
+ if (!hs->hfp_active && (ag.features & AG_FEATURE_INBAND_RINGTONE))
+ return 0;
+
g_free(ag.number);
ag.number = g_strdup(number);
ag.number_type = type;
diff --git a/audio/manager.c b/audio/manager.c
index 964309fd..fd0e6f62 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -247,7 +247,7 @@ static sdp_record_t *hsp_ag_record(uint8_t ch)
sdp_set_service_classes(record, svclass_id);
sdp_uuid16_create(&profile.uuid, HEADSET_PROFILE_ID);
- profile.version = 0x0100;
+ profile.version = 0x0102;
pfseq = sdp_list_append(0, &profile);
sdp_set_profile_descs(record, pfseq);