br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge shells

Browse Source
This commit is contained in:
topjohnwu
2017-07-18 03:34:06 +08:00
parent 2ea046cd80
commit 6933bcf7bb
14 changed files with 188 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/utils/StreamGobbler.java
+3 -8
View File
@@ -21,7 +21,7 @@ public class StreamGobbler extends Thread {
/**
* <p>StreamGobbler constructor</p>
*
* <p>We use this class because shell STDOUT and STDERR should be read as quickly as
* <p>We use this class because sh STDOUT and STDERR should be read as quickly as
* possible to prevent a deadlock from occurring, or Process.waitFor() never
* returning (as the buffer is full, pausing the native process)</p>
*
@@ -38,21 +38,16 @@ public class StreamGobbler extends Thread {
writer = outputList;
}
public StreamGobbler(InputStream inputStream, List<String> outputList, boolean root) {
this(inputStream, outputList);
isRoot = root;
}
@Override
public void run() {
// keep reading the InputStream until it ends (or an error occurs)
try {
String line;
while ((line = reader.readLine()) != null) {
if (TextUtils.equals(line, "-root-done-"))
if (TextUtils.equals(line, "-shell-done-"))
return;
writer.add(line);
Logger.shell(isRoot, line);
Logger.shell(line);
}
} catch (IOException e) {
// reader probably closed, expected exit condition