Reduced timeouts and fixed reflection calls on studio 1.3

Author: Philippe Breault

.idea/misc.xml

@@ -19,7 +19,7 @@ public static boolean isAppInstalled(IDevice device, String packageName) throws
         GenericReceiver receiver = new GenericReceiver();
         // "pm list packages com.my.package" will return one line per package installed that corresponds to this package.
         // if this list is empty, we know for sure that the app is not installed
-        device.executeShellCommand("pm list packages " + packageName, receiver, 5L, TimeUnit.MINUTES);
+        device.executeShellCommand("pm list packages " + packageName, receiver, 15L, TimeUnit.SECONDS);
 
         //TODO make sure that it is the exact package name and not a subset.
         // e.g. if our app is called com.example but there is another app called com.example.another.app, it will match and return a false positive
@@ -44,7 +44,7 @@ public static String computePackageName(AndroidFacet facet) {
     public static String getDefaultLauncherActivityName(AndroidFacet facet) {
         try {
             return DefaultActivityLocator.getDefaultLauncherActivityName(facet.getManifest());
-        } catch (Exception e) {
+        } catch (Error e) {
             return Reflect.on(AndroidUtils.class).call("getDefaultLauncherActivityName", facet.getManifest()).get();
         }
     }

.idea/vcs.xml

@@ -17,7 +17,7 @@ public class ClearDataCommand implements Command {
     public boolean run(Project project, IDevice device, AndroidFacet facet, String packageName) {
         try {
             if (isAppInstalled(device, packageName)) {
-                device.executeShellCommand("pm clear " + packageName, new GenericReceiver(), 5L, TimeUnit.MINUTES);
+                device.executeShellCommand("pm clear " + packageName, new GenericReceiver(), 15L, TimeUnit.SECONDS);
                 info(String.format("<b>%s</b> cleared data for app on %s", packageName, device.getName()));
                 return true;
             } else {

src/com/developerphil/adbidea/adb/AdbUtil.java

@@ -16,7 +16,7 @@ public class KillCommand implements Command {
     public boolean run(Project project, IDevice device, AndroidFacet facet, String packageName) {
         try {
             if (isAppInstalled(device, packageName)) {
-                device.executeShellCommand("am force-stop " + packageName, new GenericReceiver(), 5L, TimeUnit.MINUTES);
+                device.executeShellCommand("am force-stop " + packageName, new GenericReceiver(), 15L, TimeUnit.SECONDS);
                 info(String.format("<b>%s</b> forced-stop on %s", packageName, device.getName()));
                 return true;
             } else {

src/com/developerphil/adbidea/adb/command/ClearDataCommand.java

@@ -26,7 +26,7 @@ public boolean run(Project project, IDevice device, AndroidFacet facet, String p
 
         try {
             StartActivityReceiver receiver = new StartActivityReceiver();
-            device.executeShellCommand("am start " + component, receiver, 5L, TimeUnit.MINUTES);
+            device.executeShellCommand("am start " + component, receiver, 15L, TimeUnit.SECONDS);
             if (receiver.isSuccess()) {
                 info(String.format("<b>%s</b> started on %s", packageName, device.getName()));
                 return true;