From 4e3ad171df3ea75b4efede0ca0c90ade703e352f Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Tue, 11 Feb 2014 17:58:20 +0100 Subject: [PATCH] android/socket: Update channel numbers OPP and PBAP channel numbers are set to same values as in Bluedroid. Both MAP and SPP use channel numbers assigned dynamically. --- android/socket.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/android/socket.c b/android/socket.c index 435d9b9fd..92b021cf5 100644 --- a/android/socket.c +++ b/android/socket.c @@ -47,11 +47,9 @@ #define RFCOMM_CHANNEL_MAX 30 -#define SPP_DEFAULT_CHANNEL 3 -#define OPP_DEFAULT_CHANNEL 9 +#define OPP_DEFAULT_CHANNEL 12 #define HFAG_DEFAULT_CHANNEL 13 -#define PBAP_DEFAULT_CHANNEL 15 -#define MAS_DEFAULT_CHANNEL 16 +#define PBAP_DEFAULT_CHANNEL 19 #define SVC_HINT_OBEX 0x10 @@ -406,7 +404,7 @@ static const struct profile_info { 0x00, 0x00, 0x11, 0x32, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB }, - .channel = MAS_DEFAULT_CHANNEL, + .channel = 0, .svc_hint = SVC_HINT_OBEX, .sec_level = BT_IO_SEC_MEDIUM, .create_record = create_mas_record @@ -415,7 +413,7 @@ static const struct profile_info { 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB }, - .channel = SPP_DEFAULT_CHANNEL, + .channel = 0, .svc_hint = 0, .sec_level = BT_IO_SEC_MEDIUM, .create_record = create_spp_record -- 2.47.3