Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 843b992b authored by Guang Zhu's avatar Guang Zhu
Browse files

clean up Process instance after we are done with the sub process 

Per java doc of java.lang.Process, #destroy() should be called
after the parent process is done with the sub process.

Bug: 20435160
Change-Id: I254982388c5b46c93c214b37a1e8563f21805e82
parent 683e3cfe

core/java/android/app/UiAutomationConnection.java

+5 −2
Original line number Diff line number Diff line
@@ -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);

                }