From 80ad19def9df7dfbde7bcb94467ad539c38eec78 Mon Sep 17 00:00:00 2001
From: "hyunsik.noh" <hyunsik.noh@samsung.com>
Date: Fri, 22 Mar 2013 10:17:21 +0900
Subject: [PATCH] [Title] Fix to check device architecture and type [Type]
 [Module]common [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution]

Change-Id: Ia7b51a2070929db22c4521aa8e3af5ee060e5539
---
 .../src/org/tizen/sdblib/Device.java                 | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
index cf28258..9dbbe0f 100644
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
@@ -289,7 +289,16 @@ final class Device implements IDevice {
     class ArchInfoReceiver extends MultiLineReceiver {
         @Override
         public void processNewLines(String[] lines) {
-            if (lines[0] != null && !lines[0].contains(Arch.ARM.getArch())) {
+            boolean bFound = false;
+            for(String line : lines) {
+                if(line != null) {
+                    if((line.toLowerCase().contains(Arch.ARM.getArch()))) {
+                        bFound = true;
+                        break;
+                    }
+                }
+            }
+            if(!bFound) {
                 mArch = Arch.X86;
             }
         }
@@ -298,8 +307,13 @@ final class Device implements IDevice {
     class DeviceTypeReceiver extends MultiLineReceiver {
         @Override
         public void processNewLines(String[] lines) {
-            if (EMULATOR.equals(lines[0])) {
-                mIsEmulator = true;
+            for(String line : lines) {
+                if(line != null) {
+                    if(EMULATOR.equals(line.toLowerCase())) {
+                        mIsEmulator = true;
+                        break;
+                    }
+                }
             }
         }
     }
-- 
2.7.4