]> cvs.zerfleddert.de Git - ms2-fixes/blobdiff - MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
improve error message when module-loading fails
[ms2-fixes] / MS2Debounce / src / de / rmdir / ms2debounce / DebounceModuleHelper.java
index bbe972e30bcd7561ec674687f3e85fe4a1435255..56698dcd95dc22f4ce219620490f5e52c901813c 100644 (file)
@@ -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;
        }
@@ -28,28 +31,79 @@ public class DebounceModuleHelper
                setPoll(getSavedPoll());
                setHwDebounce(getSavedHwDebounce());
                setHwDebounceTime(getSavedHwDebounceTime());
+               //setDriveInactive(getSavedDriveInactive());
+               setActiveHigh(getSavedActiveHigh());
        }
 
-       public void loadModule() {
-               _loadModule();
+       public boolean loadModule() throws NotRootedException,ShellException {
+               if (!_loadModule())
+                       return false;
+
                setAllValues();
+
+               return true;
        }
 
-       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();
+       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();
+               }
+
+               try {
+                       DataOutputStream sh = new DataOutputStream(rootcmd.getOutputStream());
+                       sh.writeBytes(command + "\n");
+                       sh.writeBytes("exit\n");
+                       sh.flush();
+                       sh.close();
+               } catch (java.io.IOException e) {
+                       Log.e(TAG, "Got IOException: " + e.getMessage() + " (" + e.getCause() + ")");
+                       throw new ShellException();
+               }
+
+               try {
+                       int r = rootcmd.waitFor();
 
-               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 void _loadModule() {
-               File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
+       public synchronized boolean _loadModule() throws NotRootedException,ShellException {
+               Log.i(TAG, "Loading module");
+
+               if (isLoaded()) {
+                       Log.i(TAG, "Module already loaded");
+                       return true;
+               }
+
+               File insmod = new File("/system/bin/insmod");
+               if (!insmod.exists()) {
+                       insmod = new File("/system/xbin/insmod");
+                       if (!insmod.exists()) {
+                               Log.e(TAG, "insmod not found");
+                               return false;
+                       }
+               }
 
-               extractModule();
+               File debounce_ko = new File("/system/lib/modules/debounce.ko");
+               if (!debounce_ko.exists()) {
+                       debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
+
+                       extractModule();
+               }
 
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
                SharedPreferences.Editor editor = settings.edit();
@@ -58,33 +112,60 @@ public class DebounceModuleHelper
                        editor.commit();
                }
 
-               try {
-                       runAsRoot("/system/bin/insmod " + debounce_ko);
-               } catch (Exception e) {
-                       return;
+               runAsRoot(insmod + " " + debounce_ko);
+
+               int cnt = 10;
+               while ((!isLoaded()) && (cnt > 0)) {
+                       try {
+                               Thread.sleep(100);
+                       } catch (Exception e) {
+                               Log.e(TAG, "Got Exception: " + e.getMessage() + " (" + e.getCause() + ")");
+                               return false;
+                       }
+                       cnt--;
                }
 
                if (!isLoaded()) {
-                       return;
+                       Log.e(TAG, "Module doesn't appear to be correctly loaded");
+                       return false;
                }
 
                if (getDelay() < 0) {
-                       return;
+                       return false;
                }
 
                /* Module was obviously loaded, so it is safe to load on boot */
                editor.putBoolean("safe_to_load", true);
                editor.commit();
+
+               Log.i(TAG, "Module loaded successfully");
+               return true;
        }
 
-       public synchronized void unloadModule() {
-               try {
-                       runAsRoot("/system/bin/rmmod debounce");
-               } catch (Exception e) {}
+       public synchronized void unloadModule() throws NotRootedException,ShellException {
+               Log.i(TAG, "Unloading module");
+
+               if (!isLoaded()) {
+                       Log.i(TAG, "Module not loaded");
+                       return;
+               }
+
+               File rmmod = new File("/system/bin/rmmod");
+
+               if (!rmmod.exists()) {
+                       rmmod = new File("/system/xbin/rmmod");
+                       if (!rmmod.exists()) {
+                               Log.e(TAG, "rmmod not found");
+                               return;
+                       }
+               }
+
+               runAsRoot(rmmod + " debounce");
        }
 
        public synchronized boolean isLoaded() {
                boolean loaded = false;
+
                try {
                        String read;
 
@@ -93,10 +174,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;
                }
@@ -185,6 +269,34 @@ public class DebounceModuleHelper
                setValue("hw_debounce_time", time);
        }
 
+       public synchronized boolean getDriveInactive() {
+               if (getValue("drive_inactive_flag") == 1)
+                       return true;
+
+               return false;
+       }
+
+       public synchronized void setDriveInactive(boolean enable) {
+               if (enable)
+                       setValue("drive_inactive_flag", 1);
+               else
+                       setValue("drive_inactive_flag", 0);
+       }
+
+       public synchronized boolean getActiveHigh() {
+               if (getValue("active_high_flag") == 1)
+                       return true;
+
+               return false;
+       }
+
+       public synchronized void setActiveHigh(boolean enable) {
+               if (enable)
+                       setValue("active_high_flag", 1);
+               else
+                       setValue("active_high_flag", 0);
+       }
+
        public synchronized int getSavedDelay() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
@@ -230,7 +342,7 @@ public class DebounceModuleHelper
        public synchronized boolean getSavedHwDebounce() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
-               return settings.getBoolean("hw_debounce", true);
+               return settings.getBoolean("hw_debounce", false);
        }
 
        public synchronized void setSavedHwDebounce(boolean enable) {
@@ -255,6 +367,34 @@ public class DebounceModuleHelper
                editor.commit();
        }
 
+       public synchronized boolean getSavedDriveInactive() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getBoolean("drive_inactive", false);
+       }
+
+       public synchronized void setSavedDriveInactive(boolean enable) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putBoolean("drive_inactive", enable);
+               editor.commit();
+       }
+
+       public synchronized boolean getSavedActiveHigh() {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+               return settings.getBoolean("active_high", false);
+       }
+
+       public synchronized void setSavedActiveHigh(boolean enable) {
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+
+               editor.putBoolean("active_high", enable);
+               editor.commit();
+       }
+
        public synchronized boolean is_safe_to_load() {
                SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
                return settings.getBoolean("safe_to_load", false);
Impressum, Datenschutz