]> git.zerfleddert.de Git - ms2-fixes/commitdiff
add logging to runAsRoot
authorMichael Gernoth <michael@gernoth.net>
Mon, 29 Oct 2012 12:44:59 +0000 (13:44 +0100)
committerMichael Gernoth <michael@gernoth.net>
Mon, 29 Oct 2012 12:44:59 +0000 (13:44 +0100)
MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java

index b01b2b52930fe67dc20e25f8738cbb210bea0de0..2b088d799f1991e1ac66a7ffddf62cc0e8f14f79 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;
        }
@@ -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,15 +62,23 @@ 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 {
Impressum, Datenschutz