X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/1786d1916425cb53b022b5c3179c896b98a31a41..0c4d887cedf2d981df24dcf7716b283be10e64e6:/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 6234eae..2ee5501 100644 --- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java +++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java @@ -32,23 +32,43 @@ public class DebounceModuleHelper 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; + + try { + rootcmd = Runtime.getRuntime().exec(new String[]{"su","-c","sh"}); + } catch (java.io.IOException e) { + 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) { + throw new ShellException(); + } - rootcmd.waitFor(); + try { + if (rootcmd.waitFor() != 0) + throw new ShellException(); + } catch (java.lang.InterruptedException e) { + throw new ShellException(); + } } - public synchronized void _loadModule() { + public synchronized boolean _loadModule() throws NotRootedException,ShellException { File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko"); extractModule(); @@ -60,29 +80,25 @@ public class DebounceModuleHelper editor.commit(); } - try { - runAsRoot("/system/bin/insmod " + debounce_ko); - } catch (Exception e) { - return; - } + runAsRoot("/system/bin/insmod " + debounce_ko + " || /system/xbin/insmod " + debounce_ko); if (!isLoaded()) { - return; + 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(); + + return true; } - public synchronized void unloadModule() { - try { - runAsRoot("/system/bin/rmmod debounce"); - } catch (Exception e) {} + public synchronized void unloadModule() throws NotRootedException,ShellException { + runAsRoot("/system/bin/rmmod debounce || /system/xbin/rmmod debounce"); } public synchronized boolean isLoaded() {