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 a87d2a120fbaee0f4f20828163e2d3824af20e6a..bd987206c3a0826f3240d4be13eef7d7e30e7a89 100644 (file)
--- 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 b7f0ef7fa251fec3339bc185aae860f9ee2807c1..b24cb5c5ca61672d007887aa46187bf27e55ec2f 100755 (executable)
--- 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 98ba55d9ed7bb76467971777ba738b18a0ce25d1..66394e2d0188cc1561e97ca90ea61f9d4f23ae21 100755 (executable)
--- 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;