[tor-commits] [orbot/master] make sure to clean up ps process/shell

[n8fr8@xxxxxxxxxxxxxx]

commit 03b39eae7a07d4451e1d6516527546f97dd5fa56
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Tue Aug 5 06:14:27 2014 -0400

    make sure to clean up ps process/shell
---
 src/org/torproject/android/service/TorServiceConstants.java |    2 ++
 src/org/torproject/android/service/TorServiceUtils.java     |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java
index 0e14c15..432f6c7 100644
--- a/src/org/torproject/android/service/TorServiceConstants.java
+++ b/src/org/torproject/android/service/TorServiceConstants.java
@@ -36,6 +36,8 @@ public interface TorServiceConstants {
 	public final static String SHELL_CMD_KILL = "kill -9";
 	public final static String SHELL_CMD_RM = "rm";
 	public final static String SHELL_CMD_PS = "toolbox ps";
+	public final static String SHELL_CMD_PS_ALT = "ps";
+	
 	//public final static String SHELL_CMD_PIDOF = "pidof";
 	public final static String SHELL_CMD_LINK = "ln -s";
 	public final static String SHELL_CMD_CP = "cp";
diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java
index 18ae550..0038a5c 100644
--- a/src/org/torproject/android/service/TorServiceUtils.java
+++ b/src/org/torproject/android/service/TorServiceUtils.java
@@ -107,6 +107,8 @@ public class TorServiceUtils implements TorServiceConstants {
         		break;
         	}
         }
+        
+        procPs.destroy();
        
         return procId;
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits