Attempt to (un)install APK even if waiting for the core process timed…

… out. This fixes the behaviour to match what the log output claims is happening.
jenkinsci · Feb 13, 2015 · 053d17f · 053d17f
1 parent bd2fbec
commit 053d17f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/android_emulator/InstallBuilder.java b/src/main/java/hudson/plugins/android_emulator/InstallBuilder.java
@@ -96,7 +96,6 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         boolean ready = waitForCoreProcess(build, launcher, androidSdk, deviceIdentifier);
         if (!ready) {
             AndroidEmulator.log(logger, Messages.CORE_PROCESS_DID_NOT_START());
-            return false;
         }
 
         // Uninstall APK first, if requested

diff --git a/src/main/java/hudson/plugins/android_emulator/UninstallBuilder.java b/src/main/java/hudson/plugins/android_emulator/UninstallBuilder.java
@@ -69,7 +69,6 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         boolean ready = waitForCoreProcess(build, launcher, androidSdk, deviceIdentifier);
         if (!ready) {
             AndroidEmulator.log(logger, Messages.CORE_PROCESS_DID_NOT_START());
-            return false;
         }
 
         // Execute uninstallation