charithag
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #779 from Nirothipan/master

Browse Source 
Fixes for FileNotFoundException during Virtual Android Device installation
revert-dabc3590
Madhawa Perera 8 years ago committed by GitHub
parent 20a020090c 33dc732bd3
commit addf291e3b
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File

32
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
Unescape View File

@ -156,7 +156,7 @@ public class TryIt {
if (!new File(localPath).delete()) { if (!new File(localPath).delete()) {
System.out.println("Delete " + localPath + " and try again"); System.out.println("Delete " + localPath + " and try again");
} }
handleException("Downloading " + localPath + " failed.", e); handleException("Download failed for file : " + localPath, e);
} finally { } finally {
if (in != null) if (in != null)
try { try {
@ -193,7 +193,7 @@ public class TryIt {
String response = new Scanner(System.in, StandardCharsets.UTF_8.toString()).next(); String response = new Scanner(System.in, StandardCharsets.UTF_8.toString()).next();
String emulatorLocationPath = response + File.separator + "tools" + File.separator + "emulator"; String emulatorLocationPath = response + File.separator + "tools" + File.separator + "emulator";
if (osSuffix.equals(Constants.WINDOWS_OS)) { if (osSuffix.equals(Constants.WINDOWS_OS)) {
emulatorLocationPath += Constants.WINDOWS_EXTENSION_BAT; emulatorLocationPath += Constants.WINDOWS_EXTENSION_EXE;
} }
if (new File(emulatorLocationPath).exists()) { if (new File(emulatorLocationPath).exists()) {
androidSdkHome = response; androidSdkHome = response;
@ -255,7 +255,7 @@ public class TryIt {
private void getTools(String url, String folderName) { private void getTools(String url, String folderName) {
System.out.println("Downloading " + folderName); System.out.println("Downloading " + folderName);
downloadArtifacts(url, androidSdkHome + File.separator + folderName); downloadArtifacts(url, androidSdkHome + File.separator + folderName);
System.out.println("Configuring " + folderName); System.out.println("Configuring " + folderName + ", please wait");
extractFolder(androidSdkHome + File.separator + folderName); extractFolder(androidSdkHome + File.separator + folderName);
} }
@ -505,7 +505,7 @@ public class TryIt {
String response = read.nextLine().toLowerCase(); String response = read.nextLine().toLowerCase();
if (response.matches("y")) { if (response.matches("y")) {
setSDKPath(); setSDKPath();
} else if (response.matches("n") ) { } else if (response.matches("n")) {
getAndroidSDK(); getAndroidSDK();
} else { } else {
if (count < 5) { if (count < 5) {
@ -646,7 +646,7 @@ public class TryIt {
*/ */
private void installAgent() { private void installAgent() {
String androidAgentLocation = workingDirectory + Constants.APK_LOCATION; String androidAgentLocation = workingDirectory + Constants.APK_LOCATION;
System.out.println("Installing agent ..."); System.out.println("Installing agent, please wait...");
ProcessBuilder installAgentProcessBuilder = new ProcessBuilder(adbLocation, "install", ProcessBuilder installAgentProcessBuilder = new ProcessBuilder(adbLocation, "install",
androidAgentLocation); androidAgentLocation);
try { try {
@ -734,19 +734,20 @@ public class TryIt {
if (!new File(haxmLocation).mkdirs()) { if (!new File(haxmLocation).mkdirs()) {
makeDirectoryError(haxmLocation, androidSdkHome); makeDirectoryError(haxmLocation, androidSdkHome);
} }
String folderName = "_haxm.zip"; String haxmInstaller;
getTools(System.getProperty(Constants.HAXM_URL), haxmLocation + File.separator String folderName = "extras" + File.separator + "intel" + File.separator
+ folderName); + "Hardware_Accelerated_Execution_Manager" + File.separator + "_haxm.zip";
String haxmInstaller = haxmLocation + File.separator + "silent_install"; getTools(System.getProperty(Constants.HAXM_URL), folderName);
if (osSuffix.equals(Constants.WINDOWS_OS)) { ProcessBuilder processBuilder;
haxmInstaller += Constants.WINDOWS_EXTENSION_BAT; if (osSuffix.equals(Constants.MAC_OS)) {
haxmInstaller = haxmLocation + File.separator + "silent_install.sh";
} else { } else {
haxmInstaller += Constants.MAC_HAXM_EXTENSION; haxmInstaller = haxmLocation + File.separator + "silent_install.bat";
} }
setExecutePermission(haxmInstaller); setExecutePermission(haxmInstaller);
processBuilder = new ProcessBuilder("sudo", haxmInstaller, "-m", "2048", "-log",
ProcessBuilder processBuilder = new ProcessBuilder(haxmInstaller, "-m", "2048", "-log", androidSdkHome + File.separator + "haxmSilentRun.log");
workingDirectory + File.separator + "haxmSilentRun.log"); System.out.println("Installing intel HAXM, Please wait . . . ");
processBuilder.directory(new File(haxmLocation)); processBuilder.directory(new File(haxmLocation));
processBuilder.redirectInput(ProcessBuilder.Redirect.INHERIT); processBuilder.redirectInput(ProcessBuilder.Redirect.INHERIT);
processBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT); processBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT);
@ -830,6 +831,7 @@ public class TryIt {
private void checkCacheImg(String deviceId) { private void checkCacheImg(String deviceId) {
File cacheImg = new File(userHome + File.separator + ".android" File cacheImg = new File(userHome + File.separator + ".android"
+ File.separator + "avd" + File.separator + deviceId + ".avd" + File.separator + "cache.img"); + File.separator + "avd" + File.separator + deviceId + ".avd" + File.separator + "cache.img");
System.out.print("Creating cache image, please wait ");
while (!cacheImg.exists()) { while (!cacheImg.exists()) {
System.out.print("."); System.out.print(".");
delay(1000); delay(1000);

Write Preview
Loading…
Cancel
Save