From: Michael Gernoth <michael@gernoth.net>
Date: Sat, 21 May 2011 16:36:08 +0000 (+0200)
Subject: better interaction with superuser
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/commitdiff_plain/6bb245ae4f93f3657aa56dfe4ca08d94ddce7723

better interaction with superuser
---

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index 39a29a8..80dc5ff 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -5,6 +5,7 @@ import java.io.OutputStream;
 import java.io.File;
 import java.io.FileReader;
 import java.io.BufferedReader;
+import java.io.DataOutputStream;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -13,6 +14,7 @@ public class DebounceModuleHelper
 {
 	private Context ctx;
 	public static final String PREFS_NAME = "DebounceCfg";
+	final int SUPERUSER_REQUEST = 4223;
 
 	public DebounceModuleHelper(Context context) {
 		ctx = context;
@@ -22,6 +24,17 @@ public class DebounceModuleHelper
 		loadModule(getSavedDelay());
 	}
 
+	protected void runAsRoot(String command) throws java.io.IOException,java.lang.InterruptedException {
+		Process rootcmd = Runtime.getRuntime().exec(new String[]{"su","-c","sh"});
+		DataOutputStream sh = new DataOutputStream(rootcmd.getOutputStream());
+		sh.writeBytes(command + "\n");
+		sh.writeBytes("exit\n");
+		sh.flush();
+		sh.close();
+
+		rootcmd.waitFor();
+	}
+
 	public synchronized void loadModule(int delay) {
 		File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
@@ -35,8 +48,7 @@ public class DebounceModuleHelper
 		}
 
 		try {
-			Process insmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay});
-			insmod.waitFor();
+			runAsRoot("/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay);
 		} catch (Exception e) {
 			return;
 		}
@@ -56,8 +68,7 @@ public class DebounceModuleHelper
 
 	public synchronized void unloadModule() {
 		try {
-			Process rmmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/rmmod debounce"});
-			rmmod.waitFor();
+			runAsRoot("/system/bin/rmmod debounce");
 		} catch (Exception e) {}
 	}