SDB: Get android device name
authorshingil.kang <shingil.kang@samsung.com>
Wed, 11 Mar 2015 03:01:54 +0000 (12:01 +0900)
committerDongkyun Yun <dk77.yun@samsung.com>
Tue, 21 Jul 2015 05:15:34 +0000 (14:15 +0900)
Change-Id: I7d591afd8c9f69a30f1da5b9c6d9c17549b27291
Signed-off-by: shingil.kang <shingil.kang@samsung.com>
src/transport.c

index 66fc372e95aa6f2ceb03e9d504ba477061e86a64..dce75dc9fc5e54a6de60d4fa946003a5a7b222e2 100755 (executable)
@@ -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;
+            }
         }
     }