From: Michael Gernoth Date: Fri, 20 May 2011 22:37:55 +0000 (+0200) Subject: Check if it is safe to load the module on boot X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/commitdiff_plain/08fec0be398954b85575af913448efa8a2e34d19 Check if it is safe to load the module on boot --- diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceBootReceiver.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceBootReceiver.java index 2a15ea4..cc072b0 100644 --- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceBootReceiver.java +++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceBootReceiver.java @@ -10,7 +10,9 @@ public class DebounceBootReceiver extends BroadcastReceiver{ if("android.intent.action.BOOT_COMPLETED".equals(intent.getAction())) { DebounceModuleHelper module = new DebounceModuleHelper(context); - module.loadModule(); + if (module.is_safe_to_load()) { + module.loadModule(); + } } } } diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java index 229f00a..93fd221 100644 --- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java +++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java @@ -7,20 +7,25 @@ import java.io.FileReader; import java.io.BufferedReader; import android.content.Context; +import android.content.SharedPreferences; public class DebounceModuleHelper { private Context ctx; + public static final String PREFS_NAME = "DebounceCfg"; public DebounceModuleHelper(Context context) { ctx = context; } public void loadModule() { - loadModule(10); + SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE); + + int delay = settings.getInt("debounce_delay", 10); + loadModule(delay); } - public void loadModule(int delay) { + public synchronized void loadModule(int delay) { File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko"); extractModule(); @@ -30,17 +35,31 @@ public class DebounceModuleHelper try { Process insmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay}); insmod.waitFor(); - } catch (Exception e) {} + } catch (Exception e) { + return; + } + + if (getDelay() <= 0) { + return; + } + + /* Module was obviously loaded, so it is safe to load on boot */ + if (!is_safe_to_load()) { + SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE); + SharedPreferences.Editor editor = settings.edit(); + editor.putBoolean("safe_to_load", true); + editor.commit(); + } } - public void unloadModule() { + public synchronized void unloadModule() { try { Process rmmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/rmmod debounce"}); rmmod.waitFor(); } catch (Exception e) {} } - public boolean isLoaded() { + public synchronized boolean isLoaded() { boolean loaded = false; try { String read; @@ -61,7 +80,7 @@ public class DebounceModuleHelper return loaded; } - public int getDelay() { + public synchronized int getDelay() { int debounce_delay = -1; try { @@ -79,6 +98,13 @@ public class DebounceModuleHelper return debounce_delay; } + public synchronized boolean is_safe_to_load() { + SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE); + boolean safe_to_load = settings.getBoolean("safe_to_load", false); + + return safe_to_load; + } + private synchronized void extractModule() { File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko"); diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java index 654cf5a..4f8e703 100644 --- a/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java +++ b/MS2Debounce/src/de/rmdir/ms2debounce/MS2Debounce.java @@ -21,6 +21,6 @@ public class MS2Debounce extends Activity setContentView(R.layout.main); TextView text = (TextView)findViewById(R.id.text); - text.setText("You will soon be able to set the debounce_delay here.\nModule loaded: " + module.isLoaded() + "\ndebounce_delay: " + module.getDelay() + "ms"); + text.setText("You will soon be able to set the debounce_delay here.\nModule loaded: " + module.isLoaded() + "\ndebounce_delay: " + module.getDelay() + "ms\nsafe_to_load: " + module.is_safe_to_load()); } }