[Title] modify 'failed emulator launch'

[Type] bug fix
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 1e9d371..740dcf7 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Package: emulator-manager
-Version: 1.0.8
+Version: 1.0.9
 OS: linux
 Build-host-os: linux
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>

diff --git a/src/org/tizen/emulator/manager/tool/Launcher.java b/src/org/tizen/emulator/manager/tool/Launcher.java
index 06df14d..03a158d 100644 (file)
--- a/src/org/tizen/emulator/manager/tool/Launcher.java
+++ b/src/org/tizen/emulator/manager/tool/Launcher.java
@@ -100,8 +100,14 @@ public class Launcher {
                        int isLinux = System.getProperty("os.name").toLowerCase().indexOf("linux");
                        int isWindows = System.getProperty("os.name").toLowerCase().indexOf("linux");
                        String osVersion = System.getProperty("os.version");
-                       boolean isFileshare = !fileshare.equals("none");
-                       boolean isSDcard = !sdcard.equals("none");
+                       boolean isFileshare = true;
+                       if (fileshare == null) {
+                               isFileshare = false;
+                       }
+                       boolean isSDcard = true;
+                       if (sdcard == null) {
+                               isSDcard = false;
+                       }
                        cmd.add(fio.getBinPath() + File.separator + binary);
                        cmd.add("--skin-args");
                        cmd.add("width=" + width);

diff --git a/src/org/tizen/emulator/manager/vt/VirtualTargetHelper.java b/src/org/tizen/emulator/manager/vt/VirtualTargetHelper.java
index 79d0251..210ac9d 100644 (file)
--- a/src/org/tizen/emulator/manager/vt/VirtualTargetHelper.java
+++ b/src/org/tizen/emulator/manager/vt/VirtualTargetHelper.java
@@ -87,14 +87,14 @@ public class VirtualTargetHelper {
                oldTarget.resolution = String.valueOf(re.getWidth()) + "x" + String.valueOf(re.getHeight());
                oldTarget.dpi = property.getConfiguration().getDevice().getDisplay().getDensity().getValue();
                oldTarget.SDCardPath = property.getConfiguration().getDevice().getStorage().getSDCard().getDiskImage();
-               if (oldTarget.SDCardPath != null && !oldTarget.SDCardPath.equals("")) {
+               if (oldTarget.SDCardPath != null) {
                        oldTarget.isSDCardSupport = true;
                } else if (oldTarget.SDCardPath == null) {
                        oldTarget.SDCardPath = "";
                }
                
                oldTarget.fileSharePath = property.getConfiguration().getUsability().getFileSharing().getPath();
-               if (oldTarget.fileSharePath  != null && !oldTarget.fileSharePath.equals("")) {
+               if (oldTarget.fileSharePath  != null) {
                        oldTarget.isFileShareSupport = true;
                } else if (oldTarget.fileSharePath == null) {
                        oldTarget.fileSharePath = "";

diff --git a/src/org/tizen/emulator/manager/vt/VirtualTargetProcess.java b/src/org/tizen/emulator/manager/vt/VirtualTargetProcess.java
index 63a8a26..c2b50fc 100644 (file)
--- a/src/org/tizen/emulator/manager/vt/VirtualTargetProcess.java
+++ b/src/org/tizen/emulator/manager/vt/VirtualTargetProcess.java
@@ -79,7 +79,7 @@ class ModifyVirtualTargetProcess extends Process {
                                }
                                property.getConfiguration().getDevice().getStorage().getSDCard().setDiskImage(newTarget.SDCardPath);
                        } else {
-                               property.getConfiguration().getDevice().getStorage().getSDCard().setDiskImage("");
+                               property.getConfiguration().getDevice().getStorage().getSDCard().setDiskImage(null);
                        }
                } else if (newTarget.isSDCardSupport && !newTarget.SDCardPath.equals(oldTarget.SDCardPath)) {
                        if (!modifySDCard(newTarget)) {
@@ -93,10 +93,10 @@ class ModifyVirtualTargetProcess extends Process {
                }
                
                if (newTarget.isFileShareSupport != oldTarget.isFileShareSupport) {
-                       if (newTarget.isFileShareSupport) {
+                       if (newTarget.isFileShareSupport || !newTarget.fileSharePath.isEmpty()) {
                                property.getConfiguration().getUsability().getFileSharing().setPath(newTarget.fileSharePath);
                        } else {
-                               property.getConfiguration().getUsability().getFileSharing().setPath("");
+                               property.getConfiguration().getUsability().getFileSharing().setPath(null);
                        }
                } else if (newTarget.isFileShareSupport && !newTarget.fileSharePath.equals(oldTarget.fileSharePath)) {
                        property.getConfiguration().getUsability().getFileSharing().setPath(newTarget.fileSharePath);