From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Mon, 16 Dec 2013 01:55:08 +0000 (+0900)
Subject: emulator: modified reset function for emulator
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~557^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a23524907d11750ed6710de44d9e5aee3d56f23b;p=sdk%2Femulator%2Fqemu.git

emulator: modified reset function for emulator

1. added state flag resetting in skin
2. changed enum value for RESET
3. removed temporary code

Change-Id: Ia3f2fff01c98d8b059be1ee7f3713df773956f17
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h
index a87d2a120f..bd987206c3 100644
--- a/tizen/src/emul_state.h
+++ b/tizen/src/emul_state.h
@@ -38,9 +38,8 @@
 #include "maru_finger.h"
 
 enum {
-    BOOTING = 0,
+    RESET = 0,
     BOOT_COMPLETED = 1,
-    RESET = 2,
 };
 
 /* keep it consistent with emulator-skin definition */
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index b7f0ef7fa2..b24cb5c5ca 100755
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -1753,13 +1753,13 @@ public class EmulatorSkin {
 		SelectionAdapter listener = new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if (communicator.isEcsServerStarted() == false) {
+				/* if (communicator.isEcsServerStarted() == false) {
 					SkinUtil.openMessage(shell, null,
 							"Control Panel is not ready.\n"
 							+ "Please wait until the emulator is completely boot up.",
 							SWT.ICON_WARNING, config);
 					return;
-				}
+				} */
 
 				String ecpPath = SkinUtil.getEcpPath();
 
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
index 98ba55d9ed..66394e2d01 100755
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
@@ -466,6 +466,9 @@ public class SocketCommunicator implements ICommunicator {
 				case RECV_EMUL_RESET: {
 					logger.info("received EMUL_RESET from QEMU");
 
+					isSensorDaemonStarted = false;
+					isSdbDaemonStarted = false;
+					isEcsServerStarted = false;
 					// TODO:
 
 					break;