Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 53b3bb07: Merge "clean up Process instance after we are done with the sub process" into mnc-dev

Browse Source 
* commit '53b3bb072bcebd6b7d89a6b06139f458e9240ae9':
  clean up Process instance after we are done with the sub process
This commit is contained in:
Guang Zhu
2015-06-09 00:33:50 +00:00
committed by Android Git Automerger
parent eed6e7a287 53b3bb072b
commit a60e72ae2c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/UiAutomationConnection.java
View File

@@ -239,9 +239,10 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub {
public void run() {
InputStream in = null;
OutputStream out = null;
java.lang.Process process = null;
try {
java.lang.Process process = Runtime.getRuntime().exec(command);
process = Runtime.getRuntime().exec(command);
in = process.getInputStream();
out = new FileOutputStream(sink.getFileDescriptor());
@@ -257,7 +258,9 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub {
} catch (IOException ioe) {
throw new RuntimeException("Error running shell command", ioe);
} finally {
IoUtils.closeQuietly(in);
if (process != null) {
process.destroy();
}
IoUtils.closeQuietly(out);
IoUtils.closeQuietly(sink);
}