Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/com/stericson/RootShell/execution/Shell.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static enum ShellType {
//this is only used with root shells
public static enum ShellContext {
NORMAL("normal"), //The normal context...
SHELL("u:r:shell:s0"), //Unprivileged shell (such as an adb shell)
SHELL("u:r:shell:s0"), //unprivileged shell (such as an adb shell)
SYSTEM_SERVER("u:r:system_server:s0"), // system_server, u:r:system:s0 on some firmwares
SYSTEM_APP("u:r:system_app:s0"), // System apps
PLATFORM_APP("u:r:platform_app:s0"), // System apps
Expand Down Expand Up @@ -187,7 +187,7 @@ private Shell(String cmd, ShellType shellType, ShellContext shellContext, int sh
worker.join(this.shellTimeout);

/**
* The operation could not be completed before the timeout occured.
* The operation could not be completed before the timeout occurred.
*/
if (worker.exit == -911) {

Expand Down Expand Up @@ -651,7 +651,7 @@ public void run() {
isReading = true;

/**
* If we recieve EOF then the shell closed?
* If we receive EOF then the shell closed?
*/
if (outputLine == null) {
break;
Expand Down Expand Up @@ -983,7 +983,7 @@ public void run() {
break;
}

shell.error = "unkown error occured.";
shell.error = "unknown error occurred.";
}
} catch (IOException e) {
exit = -42;
Expand Down