From 054c10df3e61306cd2a1129f0cb4d7854151725a Mon Sep 17 00:00:00 2001
From: Nirothipan <nirothipan@gmail.com>
Date: Wed, 21 Jun 2017 09:57:30 +0530
Subject: [PATCH] updates

---
 .../src/main/java/org.carbon.android.emulator/TryIt.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
index 2d218f77b..f6c160bf0 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
@@ -97,7 +97,6 @@ public class TryIt {
             Process startShell = startShellProcessBuilder.start();
             System.out.println("Connected to device shell");
             startShell.waitFor();
-            startShell.destroy();
         } catch (IOException | InterruptedException ignored) {
             // script can continue without this process
         }
@@ -664,7 +663,7 @@ public class TryIt {
                 makeDirectoryError(haxmLocation,androidSdkHome);
             }
             String folderName = "_haxm.zip";
-            getTools(Constants.HAXM_URL, haxmLocation + File.separator
+            getTools(System.getProperty(Constants.HAXM_URL), haxmLocation + File.separator
                     + folderName);
             String haxmInstaller = haxmLocation + File.separator + "silent_install";
             if (osSuffix.equals(Constants.WINDOWS_OS)) {