Resolved Merge Conflict

Stericson · Dec 17, 2016 · ef504e0 · ef504e0
2 parents 343501b + c69dc82
commit ef504e0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/stericson/RootShell/RootShell.java b/src/main/java/com/stericson/RootShell/RootShell.java
@@ -413,11 +413,11 @@ public void commandOutput(int id, String line) {
     }
 
     /**
-     * @return <code>true</code> if BusyBox was found.
+     * @return <code>true</code> if BusyBox or Toybox was found.
      */
     public static boolean isBusyboxAvailable()
     {
-        return (findBinary("busybox", true)).size() > 0;
+        return (findBinary("busybox", true)).size() > 0 || (findBinary("toybox", true)).size() > 0;
     }
 
     /**