don't try to load the module if it is already loaded

[ms2-fixes] / MS2Debounce / src / de / rmdir / ms2debounce / DebounceModuleHelper.java

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index fbcc8374aad6c3532db6fbbacfe9cdf5cb219e12..1a424f85842a573927d6c93240ac9af757c3ed36 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -11,6 +11,7 @@ import java.io.DataOutputStream;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.util.Log;
 
 public class DebounceModuleHelper
 {
@@ -18,6 +19,8 @@ public class DebounceModuleHelper
        public static final String PREFS_NAME = "DebounceCfg";
        final int SUPERUSER_REQUEST = 4223;
 
+       private static final String TAG = "DebounceModuleHelper";
+
        public DebounceModuleHelper(Context context) {
                ctx = context;
        }
@@ -44,9 +47,11 @@ public class DebounceModuleHelper
        protected void runAsRoot(String command) throws NotRootedException,ShellException {
                Process rootcmd;
 
+               Log.i(TAG, "Running as root: " + command);
                try {
                        rootcmd = Runtime.getRuntime().exec(new String[]{"su","-c","sh"});
                } catch (java.io.IOException e) {
+                       Log.e(TAG, "Got IOException: " + e.getMessage() + " (" + e.getCause() + ")");
                        throw new NotRootedException();
                }
 
@@ -57,18 +62,30 @@ public class DebounceModuleHelper
                        sh.flush();
                        sh.close();
                } catch (java.io.IOException e) {
+                       Log.e(TAG, "Got IOException: " + e.getMessage() + " (" + e.getCause() + ")");
                        throw new ShellException();
                }
 
                try {
-                       if (rootcmd.waitFor() != 0)
+                       int r = rootcmd.waitFor();
+
+                       if (r != 0) {
+                               Log.e(TAG, "Process returned: " + r);
                                throw new ShellException();
+                       }
                } catch (java.lang.InterruptedException e) {
+                       Log.e(TAG, "Got InterruptedException: " + e.getMessage() + " (" + e.getCause() + ")");
                        throw new ShellException();
                }
+
+               Log.i(TAG, "Process executed successfully");
        }
 
        public synchronized boolean _loadModule() throws NotRootedException,ShellException {
+               if (isLoaded()) {
+                       return true;
+               }
+
                File insmod = new File("/system/bin/insmod");
                if (!insmod.exists()) {
                        insmod = new File("/system/xbin/insmod");
@@ -93,6 +110,16 @@ public class DebounceModuleHelper
 
                runAsRoot(insmod + " " + debounce_ko);
 
+               int cnt = 10;
+               while ((!isLoaded()) && (cnt > 0)) {
+                       try {
+                               Thread.sleep(100);
+                       } catch (Exception e) {
+                               return false;
+                       }
+                       cnt--;
+               }
+
                if (!isLoaded()) {
                        return false;
                }
@@ -123,6 +150,7 @@ public class DebounceModuleHelper
 
        public synchronized boolean isLoaded() {
                boolean loaded = false;
+
                try {
                        String read;
 
@@ -131,10 +159,13 @@ public class DebounceModuleHelper
 
                        while((read = modules_buf.readLine()) != null) {
                                if (read.regionMatches(0, "debounce", 0, 8)) {
-                                       loaded = true;
+                                       File sysdir = new File("/sys/devices/debounce");
+                                       if (sysdir.exists() && sysdir.isDirectory()) {
+                                               loaded = true;
+                                               break;
+                                       }
                                }
                        }
-
                } catch (Exception e) {
                        loaded = false;
                }