From 87fbd906ee6d73d77a4606c8a091ee95ad292f7e Mon Sep 17 00:00:00 2001 From: "shingil.kang" Date: Wed, 11 Mar 2015 12:01:54 +0900 Subject: [PATCH] SDB: Get android device name Change-Id: I7d591afd8c9f69a30f1da5b9c6d9c17549b27291 Signed-off-by: shingil.kang --- src/transport.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/transport.c b/src/transport.c index 66fc372..dce75dc 100755 --- a/src/transport.c +++ b/src/transport.c @@ -300,19 +300,35 @@ static void parse_banner(char *data, TRANSPORT *t) t->connection_state = CS_HOST; } s_free(banner); + // since version 2 char *tokens[CNXN_DATA_MAX_TOKENS]; - size_t cnt = tokenize(data, "::", tokens, CNXN_DATA_MAX_TOKENS); - - if (cnt == 3) { - // update device_name except usb device but it should be changed soon. - if (strcmp(STATE_UNKNOWN, tokens[1])) { - t->device_name = strdup(tokens[1]); + size_t cnt = 0; + + // android specific + if(strstr(data, "ro.product.model") != NULL) { + char *name; + cnt = tokenize(data, ";", tokens, 3); + if(strstr(tokens[1], "ro.product.model") != NULL) { + name = strchr(tokens[1], '='); + if( name != NULL) { + *name++ = '\0'; + t->device_name = strdup(name); + } } + // tizen specific + } else { + cnt = tokenize(data, "::", tokens, CNXN_DATA_MAX_TOKENS); + if (cnt == 3) { + // update device_name except usb device but it should be changed soon. + if (strcmp(STATE_UNKNOWN, tokens[1])) { + t->device_name = strdup(tokens[1]); + } - if (!strcmp(tokens[2], "1")) { - t->connection_state = CS_PWLOCK; - target_banner = STATE_LOCKED; + if (!strcmp(tokens[2], "1")) { + t->connection_state = CS_PWLOCK; + target_banner = STATE_LOCKED; + } } } -- 2.34.1