Merge pull request #12 from rattlehead666/master

Stericson · Stericson · commit c69dc82a0ff4 · 2016-03-18T12:07:46.000-04:00
added support for android 6
diff --git a/src/main/java/com/stericson/RootShell/RootShell.java b/src/main/java/com/stericson/RootShell/RootShell.java
@@ -390,11 +390,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")).size() > 0;
+        return (findBinary("busybox")).size() > 0 || (findBinary("toybox")).size() > 0;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -390,11 +390,11 @@ public void commandOutput(int id, String line) {`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`/**`
`393`		`- * @return <code>true</code> if BusyBox was found.`
	`393`	`+ * @return <code>true</code> if BusyBox or Toybox was found.`
`394`	`394`	`*/`
`395`	`395`	`public static boolean isBusyboxAvailable()`
`396`	`396`	`{`
`397`		`- return (findBinary("busybox")).size() > 0;`
	`397`	`+ return (findBinary("busybox")).size() > 0 \|\| (findBinary("toybox")).size() > 0;`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`/**`