From 6240551eed8122aaafb3cb764373c056f309eae0 Mon Sep 17 00:00:00 2001
From: Pedro Veloso <pedro.n.veloso@gmail.com>
Date: Wed, 17 Oct 2012 11:30:59 +0100
Subject: [PATCH 1/3] proper package naming, some JavaDoc fixes and better
 AndroidVersion code

---
 .../common/CommonLogSettings.java             |   12 +-
 .../common/contrib/Util.java                  |   95 +-
 .../common/kernelutils/AlarmsDumpsys.java     |  319 +-
 .../android/common/kernelutils/Netstats.java  |  219 +-
 .../common/kernelutils/RootDetection.java     |   64 +-
 .../android/common/kernelutils/Wakelocks.java |  357 +--
 .../privateapiproxies/BatteryStatsProxy.java  | 2776 ++++++++---------
 .../android/system/AndroidVersion.java        |   85 +-
 8 files changed, 1797 insertions(+), 2130 deletions(-)
 rename src/com/asksven/{andoid => android}/common/CommonLogSettings.java (74%)
 rename src/com/asksven/{andoid => android}/common/contrib/Util.java (63%)

diff --git a/src/com/asksven/andoid/common/CommonLogSettings.java b/src/com/asksven/android/common/CommonLogSettings.java
similarity index 74%
rename from src/com/asksven/andoid/common/CommonLogSettings.java
rename to src/com/asksven/android/common/CommonLogSettings.java
index 68eb113..556a2c1 100644
--- a/src/com/asksven/andoid/common/CommonLogSettings.java
+++ b/src/com/asksven/android/common/CommonLogSettings.java
@@ -13,16 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.asksven.andoid.common;
+package com.asksven.android.common;
 
 /**
  * @author sven
- *
  */
-public class CommonLogSettings
-{
-	public static final String LOGGING_TAG = "AndoidCommon";
-	public static boolean DEBUG = false;
-	public static boolean TRACE = false;
+public class CommonLogSettings {
+    public static final String LOGGING_TAG = "AndroidCommon";
+    public static boolean DEBUG = false;
+    public static boolean TRACE = false;
 
 }
diff --git a/src/com/asksven/andoid/common/contrib/Util.java b/src/com/asksven/android/common/contrib/Util.java
similarity index 63%
rename from src/com/asksven/andoid/common/contrib/Util.java
rename to src/com/asksven/android/common/contrib/Util.java
index da2ecbc..2d37afe 100644
--- a/src/com/asksven/andoid/common/contrib/Util.java
+++ b/src/com/asksven/android/common/contrib/Util.java
@@ -1,68 +1,37 @@
 /*******************************************************************************
  * Copyright (c) 2011 Adam Shanks (ChainsDD)
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.asksven.andoid.common.contrib;
-
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
+package com.asksven.android.common.contrib;
 
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.preference.PreferenceManager;
-import android.text.format.DateFormat;
 import android.util.Log;
-import android.util.SparseArray;
+
+import java.io.*;
+import java.util.ArrayList;
 
 
 public class Util {
     private static final String TAG = "Util";
-    
-    
-    
+
 
     public static ArrayList<String> run(String command) {
         return run("/system/bin/sh", command);
     }
 
     public static ArrayList<String> run(String shell, String command) {
-        return run(shell, new String[] {
+        return run(shell, new String[]{
                 command
         });
     }
@@ -134,29 +103,29 @@ public static boolean writeStoreFile(Context context, int uid, int execUid, Stri
         }
         return true;
     }
-    
+
     public static boolean writeDetaultStoreFile(Context context, String action) {
-       File storedDir = new File(context.getFilesDir().getAbsolutePath() + File.separator + "stored");
-       storedDir.mkdirs();
-       File defFile = new File(storedDir.getAbsolutePath() + File.separator + "default");
-       try {
-           OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(defFile.getAbsolutePath()));
-           if (action.equals("allow")) {
-               out.write("1");
-           } else if (action.equals("deny")) {
-               out.write("0");
-           } else {
-               out.write("-1");
-           }
-           out.flush();
-           out.close();
-       } catch (FileNotFoundException e) {
-           Log.w(TAG, "Default file not written", e);
-           return false;
-       } catch (IOException e) {
-           Log.w(TAG, "Default file not written", e);
-           return false;
-       }
-       return true;
+        File storedDir = new File(context.getFilesDir().getAbsolutePath() + File.separator + "stored");
+        storedDir.mkdirs();
+        File defFile = new File(storedDir.getAbsolutePath() + File.separator + "default");
+        try {
+            OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(defFile.getAbsolutePath()));
+            if (action.equals("allow")) {
+                out.write("1");
+            } else if (action.equals("deny")) {
+                out.write("0");
+            } else {
+                out.write("-1");
+            }
+            out.flush();
+            out.close();
+        } catch (FileNotFoundException e) {
+            Log.w(TAG, "Default file not written", e);
+            return false;
+        } catch (IOException e) {
+            Log.w(TAG, "Default file not written", e);
+            return false;
+        }
+        return true;
     }
 }
diff --git a/src/com/asksven/android/common/kernelutils/AlarmsDumpsys.java b/src/com/asksven/android/common/kernelutils/AlarmsDumpsys.java
index 94f1529..f7b7f68 100644
--- a/src/com/asksven/android/common/kernelutils/AlarmsDumpsys.java
+++ b/src/com/asksven/android/common/kernelutils/AlarmsDumpsys.java
@@ -1,194 +1,161 @@
 /**
- * 
+ *
  */
 package com.asksven.android.common.kernelutils;
 
+import android.util.Log;
+import com.asksven.android.common.contrib.Util;
+import com.asksven.android.common.privateapiproxies.Alarm;
+
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import android.util.Log;
-
-import com.asksven.andoid.common.contrib.Util;
-import com.asksven.android.common.privateapiproxies.Alarm;
-import com.asksven.android.common.shellutils.Exec;
-import com.asksven.android.common.shellutils.ExecResult;
 
 /**
  * Parses the content of 'dumpsys alarm'
  * processes the result of 'dumpsys alarm' as explained in KB article
  * https://github.com/asksven/BetterBatteryStats-Knowledge-Base/wiki/AlarmManager
+ *
  * @author sven
  */
-public class AlarmsDumpsys
-{
-	static final String TAG = "AlarmsDumpsys";
-	static final String PERMISSION_DENIED = "su rights required to access alarms are not available / were not granted";
-
-	/**
-	 * Returns a list of alarm value objects
-	 * @return
-	 * @throws Exception
-	 */
-	public static ArrayList<Alarm> getAlarms()
-	{
-		ArrayList<Alarm> myAlarms = null;
-		long nTotalCount = 0;
-		// ExecResult res = Exec.execPrint(new String[]{"/system/bin/su", "-c", "/system/bin/dumpsys alarm"});
+public class AlarmsDumpsys {
+    static final String TAG = "AlarmsDumpsys";
+    static final String PERMISSION_DENIED = "su rights required to access alarms are not available / were not granted";
+
+    /**
+     * Returns a list of alarm value objects
+     *
+     * @return
+     * @throws Exception
+     */
+    public static ArrayList<Alarm> getAlarms() {
+        ArrayList<Alarm> myAlarms = null;
+        long nTotalCount = 0;
+        // ExecResult res = Exec.execPrint(new String[]{"/system/bin/su", "-c", "/system/bin/dumpsys alarm"});
 //		ExecResult res = Exec.execPrint(new String[]{"su", "-c", "dumpsys alarm"});
-		ArrayList<String> res = Util.run("su", "dumpsys alarm");
+        ArrayList<String> res = Util.run("su", "dumpsys alarm");
 //		if (res.getSuccess())
-		if (res.size() != 0)
+        if (res.size() != 0)
 
-		{
+        {
 //			String strRes = res.getResultLine(); 
-			if (true) //strRes.contains("Permission Denial"))
-			{
-				Pattern begin = Pattern.compile("Alarm Stats");
-				boolean bParsing = false;
+            if (true) //strRes.contains("Permission Denial"))
+            {
+                Pattern begin = Pattern.compile("Alarm Stats");
+                boolean bParsing = false;
 //				ArrayList<String> myRes = res.getResult(); // getTestData();
 
-				// we are looking for multiline entries in the format
-				// ' <package name>
-				// '  <time> ms running, <number> wakeups
-				// '  <number> alarms: act=<intent name> flg=<flag> (repeating 1..n times)
-				Pattern packagePattern 	= Pattern.compile("\\s\\s([a-z][a-zA-Z0-9\\.]+)");
-				Pattern timePattern 	= Pattern.compile("\\s\\s(\\d+)ms running, (\\d+) wakeups");
-				Pattern numberPattern	= Pattern.compile("\\s\\s(\\d+) alarms: act=([A-Za-z0-9\\-\\_\\.]+)");
-				
-				myAlarms = new ArrayList<Alarm>();
-				Alarm myAlarm = null;
-				
-				// process the file
-				for (int i=0; i < res.size(); i++)
-				{
-					// skip till start mark found
-					if (bParsing)
-					{
-						// parse the alarms by block 
-						String line = res.get(i);
-						Matcher mPackage 	= packagePattern.matcher(line);
-						Matcher mTime 		= timePattern.matcher(line);
-						Matcher mNumber 	= numberPattern.matcher(line);
-						
-						// first line
-						if ( mPackage.find() )
-						{
-							try
-							{
-								// if there was a previous Alarm populated store it
-								if (myAlarm != null)
-								{
-									myAlarms.add(myAlarm);
-								}
-								// we are interested in the first token 
-								String strPackageName = mPackage.group(1);
-								myAlarm = new Alarm(strPackageName);
-							}
-							catch (Exception e)
-							{
-								Log.e(TAG, "Error: parsing error in package line (" + line + ")");
-							}
-						}
-
-						// second line
-						if ( mTime.find() )
-						{
-							try
-							{
-								// we are interested in the second token
-								String strWakeups = mTime.group(2);
-								long nWakeups = Long.parseLong(strWakeups);
-	
-								if (myAlarm == null)
-								{
-									Log.e(TAG, "Error: time line found but without alarm object (" + line + ")");
-								}
-								else
-								{
-									myAlarm.setWakeups(nWakeups);
-									nTotalCount += nWakeups;
-								}
-							}
-							catch (Exception e)
-							{
-								Log.e(TAG, "Error: parsing error in time line (" + line + ")");
-							}
-						}
-
-						// third line (and following till next package
-						if ( mNumber.find() )
-						{
-							try
-							{
-								// we are interested in the first and second token
-								String strNumber = mNumber.group(1);
-								String strIntent = mNumber.group(2);
-								long nNumber = Long.parseLong(strNumber);
-	
-								if (myAlarm == null)
-								{
-									Log.e(TAG, "Error: number line found but without alarm object (" + line + ")");
-								}
-								else
-								{
-									myAlarm.addItem(nNumber, strIntent);
-								}
-							}
-							catch (Exception e)
-							{
-								Log.e(TAG, "Error: parsing error in number line (" + line + ")");
-							}
-						}
-					}
-					else
-					{
-						// look for beginning
-						Matcher line = begin.matcher(res.get(i));
-						if (line.find())
-						{
-							bParsing = true;
-						}
-					}
-				}
-				// the last populated alarms has not been added to the list yet
-				myAlarms.add(myAlarm);
-				
-			}
-			else
-			{
-				myAlarms = new ArrayList<Alarm>();
-				Alarm myAlarm = new Alarm(PERMISSION_DENIED);
-				myAlarm.setWakeups(1);
-				myAlarms.add(myAlarm);
-			}
-		}
-		else
-		{
-			myAlarms = new ArrayList<Alarm>();
-			Alarm myAlarm = new Alarm(PERMISSION_DENIED);
-			myAlarm.setWakeups(1);
-			myAlarms.add(myAlarm);
-
-		}
-		
-		
-		for (int i=0; i < myAlarms.size(); i++)
-		{
-			myAlarms.get(i).setTotalCount(nTotalCount);
-		}
-		return myAlarms;
-	}
-	
-	static ArrayList<String> getTestData()
-	{
-		ArrayList<String> myRet = new ArrayList<String>()
-				{{
-					add("Alarm Stats:");
-					add("  com.google.android.gsf");
-					add("  8417ms running, 204 wakeups");
-					add("  17 alarms: act=com.google.android.intent.action.GTALK_RECONNECT flg=0x4");
-					add("  187 alarms: flg=0x4");
+                // we are looking for multiline entries in the format
+                // ' <package name>
+                // '  <time> ms running, <number> wakeups
+                // '  <number> alarms: act=<intent name> flg=<flag> (repeating 1..n times)
+                Pattern packagePattern = Pattern.compile("\\s\\s([a-z][a-zA-Z0-9\\.]+)");
+                Pattern timePattern = Pattern.compile("\\s\\s(\\d+)ms running, (\\d+) wakeups");
+                Pattern numberPattern = Pattern.compile("\\s\\s(\\d+) alarms: act=([A-Za-z0-9\\-\\_\\.]+)");
+
+                myAlarms = new ArrayList<Alarm>();
+                Alarm myAlarm = null;
+
+                // process the file
+                for (int i = 0; i < res.size(); i++) {
+                    // skip till start mark found
+                    if (bParsing) {
+                        // parse the alarms by block
+                        String line = res.get(i);
+                        Matcher mPackage = packagePattern.matcher(line);
+                        Matcher mTime = timePattern.matcher(line);
+                        Matcher mNumber = numberPattern.matcher(line);
+
+                        // first line
+                        if (mPackage.find()) {
+                            try {
+                                // if there was a previous Alarm populated store it
+                                if (myAlarm != null) {
+                                    myAlarms.add(myAlarm);
+                                }
+                                // we are interested in the first token
+                                String strPackageName = mPackage.group(1);
+                                myAlarm = new Alarm(strPackageName);
+                            } catch (Exception e) {
+                                Log.e(TAG, "Error: parsing error in package line (" + line + ")");
+                            }
+                        }
+
+                        // second line
+                        if (mTime.find()) {
+                            try {
+                                // we are interested in the second token
+                                String strWakeups = mTime.group(2);
+                                long nWakeups = Long.parseLong(strWakeups);
+
+                                if (myAlarm == null) {
+                                    Log.e(TAG, "Error: time line found but without alarm object (" + line + ")");
+                                } else {
+                                    myAlarm.setWakeups(nWakeups);
+                                    nTotalCount += nWakeups;
+                                }
+                            } catch (Exception e) {
+                                Log.e(TAG, "Error: parsing error in time line (" + line + ")");
+                            }
+                        }
+
+                        // third line (and following till next package
+                        if (mNumber.find()) {
+                            try {
+                                // we are interested in the first and second token
+                                String strNumber = mNumber.group(1);
+                                String strIntent = mNumber.group(2);
+                                long nNumber = Long.parseLong(strNumber);
+
+                                if (myAlarm == null) {
+                                    Log.e(TAG, "Error: number line found but without alarm object (" + line + ")");
+                                } else {
+                                    myAlarm.addItem(nNumber, strIntent);
+                                }
+                            } catch (Exception e) {
+                                Log.e(TAG, "Error: parsing error in number line (" + line + ")");
+                            }
+                        }
+                    } else {
+                        // look for beginning
+                        Matcher line = begin.matcher(res.get(i));
+                        if (line.find()) {
+                            bParsing = true;
+                        }
+                    }
+                }
+                // the last populated alarms has not been added to the list yet
+                myAlarms.add(myAlarm);
+
+            } else {
+                myAlarms = new ArrayList<Alarm>();
+                Alarm myAlarm = new Alarm(PERMISSION_DENIED);
+                myAlarm.setWakeups(1);
+                myAlarms.add(myAlarm);
+            }
+        } else {
+            myAlarms = new ArrayList<Alarm>();
+            Alarm myAlarm = new Alarm(PERMISSION_DENIED);
+            myAlarm.setWakeups(1);
+            myAlarms.add(myAlarm);
+
+        }
+
+
+        for (int i = 0; i < myAlarms.size(); i++) {
+            myAlarms.get(i).setTotalCount(nTotalCount);
+        }
+        return myAlarms;
+    }
+
+    static ArrayList<String> getTestData() {
+        ArrayList<String> myRet = new ArrayList<String>() {{
+            add("Alarm Stats:");
+            add("  com.google.android.gsf");
+            add("  8417ms running, 204 wakeups");
+            add("  17 alarms: act=com.google.android.intent.action.GTALK_RECONNECT flg=0x4");
+            add("  187 alarms: flg=0x4");
 //						  com.anod.calendar
 //						    311ms running, 0 wakeups
 //						    4 alarms: act=android.appwidget.action.APPWIDGET_UPDATE dat=com.anod.calendar://widget/id/45 flg=0x4
@@ -228,11 +195,11 @@ static ArrayList<String> getTestData()
 //						  com.android.deskclock
 //						    1219ms running, 4 wakeups
 //						    4 alarms: act=com.android.deskclock.ALARM_ALERT flg=0x4
-						add("  com.carl.trafficcounter");
-						add("  446486ms running, 5584 wakeups");
-						add("  5584 alarms: act=com.carl.trafficcounter.UPDATE_RUN flg=0x4");
-				}};
+            add("  com.carl.trafficcounter");
+            add("  446486ms running, 5584 wakeups");
+            add("  5584 alarms: act=com.carl.trafficcounter.UPDATE_RUN flg=0x4");
+        }};
 
-		return myRet;
-	}
+        return myRet;
+    }
 }
diff --git a/src/com/asksven/android/common/kernelutils/Netstats.java b/src/com/asksven/android/common/kernelutils/Netstats.java
index 5ee253b..66587b7 100644
--- a/src/com/asksven/android/common/kernelutils/Netstats.java
+++ b/src/com/asksven/android/common/kernelutils/Netstats.java
@@ -15,21 +15,16 @@
  */
 package com.asksven.android.common.kernelutils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.StringTokenizer;
-
-import android.util.Log;
-
-import com.asksven.andoid.common.contrib.Util;
+import com.asksven.android.common.contrib.Util;
 import com.asksven.android.common.privateapiproxies.NetworkUsage;
-import com.asksven.android.common.shellutils.Exec;
-import com.asksven.android.common.shellutils.ExecResult;
 import com.asksven.android.common.utils.StringUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 /**
  * Parses the content of /proc/net/xt_qtaguid/stats
- * instead of using the API functions NetworkStats stats = new NetworkStatsFactory().readNetworkStatsDetail(uid-here) because http://stackoverflow.com/questions/9080229/why-i-cant-read-proc-net-xt-qtaguid-stats-correctly-by-filereader-in-android-i                                  
+ * instead of using the API functions NetworkStats stats = new NetworkStatsFactory().readNetworkStatsDetail(uid-here) because http://stackoverflow.com/questions/9080229/why-i-cant-read-proc-net-xt-qtaguid-stats-correctly-by-filereader-in-android-i
  * format is:
  * idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packets rx_tcp_bytes rx_tcp_packets rx_udp_bytes rx_udp_packets rx_other_bytes rx_other_packets tx_tcp_bytes tx_tcp_packets tx_udp_bytes tx_udp_packets tx_other_bytes tx_other_packets
  * example data:
@@ -48,72 +43,70 @@
  * 14 wlan0 0x0 10003 0 697215 713 84843 848 697215 713 0 0 0 0 84371 840 472 8 0 0
  * 15 wlan0 0x0 10003 1 1938719 2030 321314 2437 1938719 2030 0 0 0 0 321314 2437 0 0 0 0
  * value holder is Netstat
+ *
  * @author sven
  */
-public class Netstats
-{
-	static final String TAG = "AlarmsDumpsys";
-	static final String PERMISSION_DENIED = "su rights required to access alarms are not available / were not granted";
-
-	private static final String KEY_IDX = "idx";
-	private static final String KEY_IFACE = "iface";
-	private static final String KEY_UID = "uid_tag_int";
-	private static final String KEY_COUNTER_SET = "cnt_set";
-	private static final String KEY_TAG_HEX = "acct_tag_hex";
-	private static final String KEY_RX_BYTES = "rx_bytes";
-	private static final String KEY_RX_PACKETS = "rx_packets";
-	private static final String KEY_TX_BYTES = "tx_bytes";
-	private static final String KEY_TX_PACKETS = "tx_packets";
-	
-
-	/**
-	 * Returns a list of alarm value objects
-	 * @return
-	 * @throws Exception
-	 */
-	public static ArrayList<NetworkUsage> parseNetstats()
-	{
-		ArrayList<NetworkUsage> myStats = new ArrayList<NetworkUsage>();
+public class Netstats {
+    static final String TAG = "AlarmsDumpsys";
+    static final String PERMISSION_DENIED = "su rights required to access alarms are not available / were not granted";
+
+    private static final String KEY_IDX = "idx";
+    private static final String KEY_IFACE = "iface";
+    private static final String KEY_UID = "uid_tag_int";
+    private static final String KEY_COUNTER_SET = "cnt_set";
+    private static final String KEY_TAG_HEX = "acct_tag_hex";
+    private static final String KEY_RX_BYTES = "rx_bytes";
+    private static final String KEY_RX_PACKETS = "rx_packets";
+    private static final String KEY_TX_BYTES = "tx_bytes";
+    private static final String KEY_TX_PACKETS = "tx_packets";
+
+
+    /**
+     * Returns a list of alarm value objects
+     *
+     * @return
+     * @throws Exception
+     */
+    public static ArrayList<NetworkUsage> parseNetstats() {
+        ArrayList<NetworkUsage> myStats = new ArrayList<NetworkUsage>();
 //		ExecResult res = Exec.execPrint(new String[]{"su", "-c", "cat /proc/net/xt_qtaguid/stats"});
-		ArrayList<String> res = Util.run("su", "cat /proc/net/xt_qtaguid/stats");
+        ArrayList<String> res = Util.run("su", "cat /proc/net/xt_qtaguid/stats");
 //		if (res.getSuccess())
-		if (res.size() != 0)
-		{
+        if (res.size() != 0) {
 //			String strRes = res.getResultLine(); 
-			if (true) //(!strRes.contains("Permission Denial"))
-			{
-				ArrayList<String> keys = new ArrayList<String>();
-				keys.add(KEY_IDX);
-				keys.add(KEY_IFACE);
-				keys.add(KEY_TAG_HEX);
-				keys.add(KEY_UID);
-				keys.add(KEY_COUNTER_SET);
-				keys.add(KEY_RX_BYTES);
-				keys.add(KEY_RX_PACKETS);
-				keys.add(KEY_TX_BYTES);
-				keys.add(KEY_TX_PACKETS);
-				
-				final ArrayList<String> values = new ArrayList<String>();
-				final HashMap<String, String> parsed = new HashMap<String, String>();
+            if (true) //(!strRes.contains("Permission Denial"))
+            {
+                ArrayList<String> keys = new ArrayList<String>();
+                keys.add(KEY_IDX);
+                keys.add(KEY_IFACE);
+                keys.add(KEY_TAG_HEX);
+                keys.add(KEY_UID);
+                keys.add(KEY_COUNTER_SET);
+                keys.add(KEY_RX_BYTES);
+                keys.add(KEY_RX_PACKETS);
+                keys.add(KEY_TX_BYTES);
+                keys.add(KEY_TX_PACKETS);
+
+                final ArrayList<String> values = new ArrayList<String>();
+                final HashMap<String, String> parsed = new HashMap<String, String>();
 
 //				ArrayList<String> myRes = res.getResult(); // getTestData();
 
-				
-				// process the file, starting on line 2
-				long totalBytes = 0;
-				for (int i=1; i < res.size(); i++)
-				{
-					String line = res.get(i);
-					StringUtils.splitLine(line, values);
-					StringUtils.parseLine(keys, values, parsed);
-					
-					//Netstat entry = new Netstat();
-					NetworkUsage entry = new NetworkUsage(
-							StringUtils.getParsedInt(parsed, KEY_UID),
-							parsed.get(KEY_IFACE),
-							StringUtils.getParsedLong(parsed, KEY_RX_BYTES),
-							StringUtils.getParsedLong(parsed, KEY_TX_BYTES));
-					
+
+                // process the file, starting on line 2
+                long totalBytes = 0;
+                for (int i = 1; i < res.size(); i++) {
+                    String line = res.get(i);
+                    StringUtils.splitLine(line, values);
+                    StringUtils.parseLine(keys, values, parsed);
+
+                    //Netstat entry = new Netstat();
+                    NetworkUsage entry = new NetworkUsage(
+                            StringUtils.getParsedInt(parsed, KEY_UID),
+                            parsed.get(KEY_IFACE),
+                            StringUtils.getParsedLong(parsed, KEY_RX_BYTES),
+                            StringUtils.getParsedLong(parsed, KEY_TX_BYTES));
+
 //					entry.iface = parsed.get(KEY_IFACE);
 //					entry.setUid(getParsedInt(parsed, KEY_UID));
 //					entry.set = getParsedInt(parsed, KEY_COUNTER_SET);
@@ -122,51 +115,47 @@ public static ArrayList<NetworkUsage> parseNetstats()
 //					entry.rxPackets	= getParsedLong(parsed, KEY_RX_PACKETS);
 //					entry.txBytes 	= getParsedLong(parsed, KEY_TX_BYTES);
 //					entry.txPackets = getParsedLong(parsed, KEY_TX_PACKETS);
-					
-					myStats = addToStats(myStats, entry);
-					totalBytes += entry.getTotalBytes();
-				}
-				
-				// set the total so that we can calculate the ratio
-				for (int i = 0; i < myStats.size(); i++)
-				{
-					myStats.get(i).setTotal(totalBytes);
-				}
-				
-			}
-		}
-		
-		return myStats;
-	}
-	
-	
-	/**
-	 * Stats may be duplicate for one uid+iface so we sum them up
-	 * @param stats
-	 * @param entry
-	 * @return
-	 */
-	static ArrayList<NetworkUsage> addToStats(ArrayList<NetworkUsage> stats, NetworkUsage entry)
-	{
-		boolean merged = false;
-		for (int i=0; i < stats.size(); i++)
-		{
-			NetworkUsage current = stats.get(i);
-			
-			if ( (current.getuid() == entry.getuid()) && (current.getInterface().equals(entry.getInterface())) )
-			{
-				current.addBytesReceived(entry.getBytesReceived());
-				current.addBytesSent(entry.getBytesSent());
-				merged = true;
-				break;
-			}
-		}
-		
-		// if not summed up add normally
-		if (!merged)
-		{
-			stats.add(entry);
-		}
-		return stats;
-	}
+
+                    myStats = addToStats(myStats, entry);
+                    totalBytes += entry.getTotalBytes();
+                }
+
+                // set the total so that we can calculate the ratio
+                for (int i = 0; i < myStats.size(); i++) {
+                    myStats.get(i).setTotal(totalBytes);
+                }
+
+            }
+        }
+
+        return myStats;
+    }
+
+
+    /**
+     * Stats may be duplicate for one uid+iface so we sum them up
+     *
+     * @param stats
+     * @param entry
+     * @return
+     */
+    static ArrayList<NetworkUsage> addToStats(ArrayList<NetworkUsage> stats, NetworkUsage entry) {
+        boolean merged = false;
+        for (int i = 0; i < stats.size(); i++) {
+            NetworkUsage current = stats.get(i);
+
+            if ((current.getuid() == entry.getuid()) && (current.getInterface().equals(entry.getInterface()))) {
+                current.addBytesReceived(entry.getBytesReceived());
+                current.addBytesSent(entry.getBytesSent());
+                merged = true;
+                break;
+            }
+        }
+
+        // if not summed up add normally
+        if (!merged) {
+            stats.add(entry);
+        }
+        return stats;
+    }
 }
diff --git a/src/com/asksven/android/common/kernelutils/RootDetection.java b/src/com/asksven/android/common/kernelutils/RootDetection.java
index 494942e..a65341c 100644
--- a/src/com/asksven/android/common/kernelutils/RootDetection.java
+++ b/src/com/asksven/android/common/kernelutils/RootDetection.java
@@ -15,46 +15,42 @@
  */
 package com.asksven.android.common.kernelutils;
 
-import java.util.ArrayList;
+import com.asksven.android.common.contrib.Util;
 
-import com.asksven.andoid.common.contrib.Util;
-import com.asksven.android.common.shellutils.Exec;
-import com.asksven.android.common.shellutils.ExecResult;
+import java.util.ArrayList;
 
 /**
  * This class provides methods for detecting if the phone is rooted
- * @author sven
  *
+ * @author sven
  */
-public class RootDetection
-{
-	
-	/**
-	 * Tests whether su can be executed.
-	 * @return 0 if 
-	 */
-	public static boolean hasSuRights()
-	{
-		return hasSuRights("ls /");
-	}
-
-	/**
-	 * Checks for su with a specific command
-	 * @param command
-	 * @return
-	 */
-	public static boolean hasSuRights(String command)
-	{
+public class RootDetection {
+
+    /**
+     * Tests whether su can be executed.
+     *
+     * @return 0 if
+     */
+    public static boolean hasSuRights() {
+        return hasSuRights("ls /");
+    }
+
+    /**
+     * Checks for su with a specific command
+     *
+     * @param command
+     * @return
+     */
+    public static boolean hasSuRights(String command) {
 //		ExecResult res = Exec.execPrint(new String[]{"su", "-c", command});
-		ArrayList<String> res = Util.run("su", command);
-		boolean bRet = false;
-		
-		if (res.size() != 0)
-		{
-			bRet = true;
-		}
-		
-		return bRet;
-	}
+        ArrayList<String> res = Util.run("su", command);
+        boolean bRet = false;
+
+        if (res.size() != 0) {
+            bRet = true;
+        }
+
+        return bRet;
+    }
 
 }
diff --git a/src/com/asksven/android/common/kernelutils/Wakelocks.java b/src/com/asksven/android/common/kernelutils/Wakelocks.java
index 4b725c1..8b8118d 100644
--- a/src/com/asksven/android/common/kernelutils/Wakelocks.java
+++ b/src/com/asksven/android/common/kernelutils/Wakelocks.java
@@ -1,222 +1,177 @@
 /**
- * 
+ *
  */
 package com.asksven.android.common.kernelutils;
 
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import com.asksven.andoid.common.CommonLogSettings;
-import com.asksven.andoid.common.contrib.Util;
-import com.asksven.android.common.privateapiproxies.NetworkUsage;
-import com.asksven.android.common.shellutils.Exec;
-import com.asksven.android.common.shellutils.ExecResult;
-import com.asksven.android.common.utils.StringUtils;
-
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningAppProcessInfo;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.SystemClock;
 import android.util.Log;
+import com.asksven.android.common.CommonLogSettings;
+import com.asksven.android.common.contrib.Util;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
  * @author sven
- *
  */
-public class Wakelocks
-{
-    private final static String TAG ="Wakelocks";
-    
-    public static ArrayList<NativeKernelWakelock> parseProcWakelocks(Context context)
-    {
-       	String filePath = "/proc/wakelocks";
-    	String delimiter = String.valueOf('\t');
-    	ArrayList<NativeKernelWakelock> myRet = new ArrayList<NativeKernelWakelock>();
-    	// format 
-    	// [name, count, expire_count, wake_count, active_since, total_time, sleep_time, max_time, last_change]
-    	ArrayList<String[]> rows = parseDelimitedFile(filePath, delimiter);
-
-    	long msSinceBoot = SystemClock.elapsedRealtime();
-
-		// list the running processes
-		ActivityManager actvityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-		List<RunningAppProcessInfo> procInfos = actvityManager.getRunningAppProcesses();
-		PackageManager pack=context.getPackageManager();
-
-    	// start with 1
-    	for (int i=1; i < rows.size(); i++ )
-    	{
-    		try
-    		{
-    			String[] data = (String[]) rows.get(i);
-    			String name = data[0];
-    			int count = Integer.valueOf(data[1]);
-    			int expire_count = Integer.valueOf(data[2]);
-    			int wake_count = Integer.valueOf(data[3]);
-    			long active_since = Long.valueOf(data[4]);
-    			long total_time = Long.valueOf(data[5]) / 1000000;
-    			long sleep_time = Long.valueOf(data[6]) / 1000000;
-    			long max_time = Long.valueOf(data[7]) / 1000000;
-    			long last_change = Long.valueOf(data[8]);
-    			
-				// post-processing of eventX-YYYY processes
-				String details = "";
+public class Wakelocks {
+    private final static String TAG = "Wakelocks";
+
+    public static ArrayList<NativeKernelWakelock> parseProcWakelocks(Context context) {
+        String filePath = "/proc/wakelocks";
+        String delimiter = String.valueOf('\t');
+        ArrayList<NativeKernelWakelock> myRet = new ArrayList<NativeKernelWakelock>();
+        // format
+        // [name, count, expire_count, wake_count, active_since, total_time, sleep_time, max_time, last_change]
+        ArrayList<String[]> rows = parseDelimitedFile(filePath, delimiter);
+
+        long msSinceBoot = SystemClock.elapsedRealtime();
+
+        // list the running processes
+        ActivityManager actvityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<RunningAppProcessInfo> procInfos = actvityManager.getRunningAppProcesses();
+        PackageManager pack = context.getPackageManager();
+
+        // start with 1
+        for (int i = 1; i < rows.size(); i++) {
+            try {
+                String[] data = (String[]) rows.get(i);
+                String name = data[0];
+                int count = Integer.valueOf(data[1]);
+                int expire_count = Integer.valueOf(data[2]);
+                int wake_count = Integer.valueOf(data[3]);
+                long active_since = Long.valueOf(data[4]);
+                long total_time = Long.valueOf(data[5]) / 1000000;
+                long sleep_time = Long.valueOf(data[6]) / 1000000;
+                long max_time = Long.valueOf(data[7]) / 1000000;
+                long last_change = Long.valueOf(data[8]);
+
+                // post-processing of eventX-YYYY processes
+                String details = "";
 //				name = "event3-30240";
-				// we start with a " here as that is the way the data comes from /proc
-				if (name.startsWith("\"event"))
-				{
-					String process = name.replaceAll("\"", "");
-					if (CommonLogSettings.DEBUG)
-					{
-						Log.d(TAG, "Pattern 'event' found in " + process);
-					}
-					
-					int proc = 0;
-					String[] parts = process.split("-");
-					if (parts.length == 2)
-					{
-						try
-						{
-							proc = Integer.valueOf(parts[1]);
-							if (CommonLogSettings.DEBUG)
-							{
-								Log.d(TAG, "Resolving proc name for 'event' " + proc);
-							}
-						}
-						catch (Exception e)
-						{
-							Log.e(TAG, "Cound not split process name " + process);
-						}
-					}
-					
-					if (proc != 0)
-					{
-						// search for the process in the task list
-						for (int psCount = 0; psCount < procInfos.size(); psCount++)
-						{
-							int id = procInfos.get(psCount).pid; 
-							if ( id == proc)
-							{
-								String processName = procInfos.get(psCount).processName;
-
-								details= processName; 
-								String appName = "";
-
-								String[] pkgList = procInfos.get(count).pkgList;
-								for (int j=0; j < pkgList.length; j++)
-								{
-									if (details.length() > 0)
-									{
-										details += ", ";
-									}
-									details += pkgList[j];
-								}
-
-								if (CommonLogSettings.DEBUG)
-								{
-									Log.d(TAG, "Pattern 'event' resolved to " + details);
-								}
-							}
-						}
-					}
-				}
-
-    			NativeKernelWakelock wl = new NativeKernelWakelock(
-    					name, details, count, expire_count, wake_count,
-    					active_since, total_time, sleep_time, max_time,
-    					last_change, msSinceBoot);
-    			myRet.add(wl);
-    		}
-    		catch (Exception e)
-    		{
-    			// go on
-    		}
-    	}
-    	return myRet;
+                // we start with a " here as that is the way the data comes from /proc
+                if (name.startsWith("\"event")) {
+                    String process = name.replaceAll("\"", "");
+                    if (CommonLogSettings.DEBUG) {
+                        Log.d(TAG, "Pattern 'event' found in " + process);
+                    }
+
+                    int proc = 0;
+                    String[] parts = process.split("-");
+                    if (parts.length == 2) {
+                        try {
+                            proc = Integer.valueOf(parts[1]);
+                            if (CommonLogSettings.DEBUG) {
+                                Log.d(TAG, "Resolving proc name for 'event' " + proc);
+                            }
+                        } catch (Exception e) {
+                            Log.e(TAG, "Cound not split process name " + process);
+                        }
+                    }
+
+                    if (proc != 0) {
+                        // search for the process in the task list
+                        for (int psCount = 0; psCount < procInfos.size(); psCount++) {
+                            int id = procInfos.get(psCount).pid;
+                            if (id == proc) {
+                                String processName = procInfos.get(psCount).processName;
+
+                                details = processName;
+                                String appName = "";
+
+                                String[] pkgList = procInfos.get(count).pkgList;
+                                for (int j = 0; j < pkgList.length; j++) {
+                                    if (details.length() > 0) {
+                                        details += ", ";
+                                    }
+                                    details += pkgList[j];
+                                }
+
+                                if (CommonLogSettings.DEBUG) {
+                                    Log.d(TAG, "Pattern 'event' resolved to " + details);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                NativeKernelWakelock wl = new NativeKernelWakelock(
+                        name, details, count, expire_count, wake_count,
+                        active_since, total_time, sleep_time, max_time,
+                        last_change, msSinceBoot);
+                myRet.add(wl);
+            } catch (Exception e) {
+                // go on
+            }
+        }
+        return myRet;
+    }
+
+    private static ArrayList<String[]> parseDelimitedFile(String filePath, String delimiter) {
+        ArrayList<String[]> rows = new ArrayList<String[]>();
+        try {
+            FileReader fr = new FileReader(filePath);
+            BufferedReader br = new BufferedReader(fr);
+            String currentRecord;
+            while ((currentRecord = br.readLine()) != null)
+                rows.add(currentRecord.split(delimiter));
+            br.close();
+        } catch (Exception e) {
+
+        }
+        return rows;
     }
-    private static ArrayList<String[]> parseDelimitedFile(String filePath, String delimiter)
-    {
-		ArrayList<String[]> rows = new ArrayList<String[]>();
-    	try
-    	{
-			FileReader fr = new FileReader(filePath);
-			BufferedReader br = new BufferedReader(fr);
-			String currentRecord;
-			while ((currentRecord = br.readLine()) != null)
-				rows.add(currentRecord.split(delimiter));
-			br.close();
-    	}
-    	catch (Exception e)
-    	{
-    		
-    	}
-		return rows;
+
+    public static boolean isDiscreteKwlPatch() {
+        boolean ret = false;
+
+        String filePath = "/sys/module/wakelock/parameters/default_stats";
+        try {
+            FileReader fr = new FileReader(filePath);
+            BufferedReader br = new BufferedReader(fr);
+
+            // read first line
+            String currentRecord = br.readLine();
+
+            if (!currentRecord.equals("0")) {
+                ret = true;
+            }
+            br.close();
+        } catch (Exception e) {
+
+        }
+        return ret;
     }
-    
-	public static boolean isDiscreteKwlPatch()
-	{
-		boolean ret = false;
-		
-		String filePath = "/sys/module/wakelock/parameters/default_stats";
-    	try
-    	{
-			FileReader fr = new FileReader(filePath);
-			BufferedReader br = new BufferedReader(fr);
-
-			// read first line
-			String currentRecord = br.readLine();
-			
-			if (!currentRecord.equals("0"))
-			{
-				ret = true;
-			}
-			br.close();
-    	}
-    	catch (Exception e)
-    	{
-    		
-    	}
-		return ret;
-	}
-	
-    public static boolean hasWakelocks(Context context)
-    {
-    	boolean myRet = false;
-       	String filePath = "/sys/power/wake_lock";
-		ArrayList<String> res = Util.run("su", "cat " + filePath);
-		// Format: 0 /sys/power/wake_lock
-		final ArrayList<String> values = new ArrayList<String>();
-		if (res.size() != 0)
-		{
-			String line = res.get(0);
-			try
-			{
-				myRet = line.contains("PowerManagerService");
-				if (myRet)
-				{
-					Log.i(TAG, "Detected userland wakelock in line " + line);
-				}
-				else
-				{
-					Log.i(TAG, "No userland wakelock detected in line " + line);
-				}
-			}
-			catch (Exception e)
-			{
-				// something went wrong
-				Log.e(TAG, "Exeception processsing " + filePath + ": " + e.getMessage());
-				myRet = false;
-			}
-		}
-    	return myRet;
+
+    public static boolean hasWakelocks(Context context) {
+        boolean myRet = false;
+        String filePath = "/sys/power/wake_lock";
+        ArrayList<String> res = Util.run("su", "cat " + filePath);
+        // Format: 0 /sys/power/wake_lock
+        final ArrayList<String> values = new ArrayList<String>();
+        if (res.size() != 0) {
+            String line = res.get(0);
+            try {
+                myRet = line.contains("PowerManagerService");
+                if (myRet) {
+                    Log.i(TAG, "Detected userland wakelock in line " + line);
+                } else {
+                    Log.i(TAG, "No userland wakelock detected in line " + line);
+                }
+            } catch (Exception e) {
+                // something went wrong
+                Log.e(TAG, "Exeception processsing " + filePath + ": " + e.getMessage());
+                myRet = false;
+            }
+        }
+        return myRet;
     }
 
 }
\ No newline at end of file
diff --git a/src/com/asksven/android/common/privateapiproxies/BatteryStatsProxy.java b/src/com/asksven/android/common/privateapiproxies/BatteryStatsProxy.java
index 3ffc98a..37e9671 100644
--- a/src/com/asksven/android/common/privateapiproxies/BatteryStatsProxy.java
+++ b/src/com/asksven/android/common/privateapiproxies/BatteryStatsProxy.java
@@ -17,84 +17,70 @@
 package com.asksven.android.common.privateapiproxies;
 
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningAppProcessInfo;
-import android.app.ActivityManager.RunningTaskInfo;
 import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.util.Log;
 import android.util.SparseArray;
-
-import com.asksven.andoid.common.CommonLogSettings;
+import com.asksven.android.common.CommonLogSettings;
 import com.asksven.android.common.nameutils.UidInfo;
 import com.asksven.android.common.nameutils.UidNameResolver;
 import com.asksven.android.common.utils.DateUtils;
 import com.asksven.android.system.AndroidVersion;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Map;
 
 
 /**
  * A proxy to the non-public API BatteryStats
  * http://grepcode.com/file/repository.grepcode.com/java/ext/com.google.android/android/2.3.3_r1/android/os/BatteryStats.java/?v=source
- * @author sven
  *
+ * @author sven
  */
-public class BatteryStatsProxy
-{
-	/*
-	 * Instance of the BatteryStatsImpl
-	 */
-	private Object m_Instance = null;
-	@SuppressWarnings("rawtypes")
-	private Class m_ClassDefinition = null;
-	
-	private static final String TAG = "BatteryStatsProxy";
-	/*
-	 * The UID stats are kept here as their methods / data can not be accessed
-	 * outside of this class due to non-public types (Uid, Proc, etc.)
-	 */
-	private SparseArray<? extends Object> m_uidStats = null;
-	
-	/** 
-	 * An instance to the UidNameResolver 
-	 */
-	private UidNameResolver m_nameResolver;
-	private static BatteryStatsProxy m_proxy = null;
-	
-	synchronized public static BatteryStatsProxy getInstance(Context ctx)
-	{
-		if (m_proxy == null)
-		{
-			m_proxy = new BatteryStatsProxy(ctx);
-		}
-		
-		return m_proxy;
-	}
-	
-	public void invalidate()
-	{
-		m_proxy = null;
-	}
-	
+public class BatteryStatsProxy {
+    /*
+     * Instance of the BatteryStatsImpl
+     */
+    private Object m_Instance = null;
+    @SuppressWarnings("rawtypes")
+    private Class m_ClassDefinition = null;
+
+    private static final String TAG = "BatteryStatsProxy";
+    /*
+     * The UID stats are kept here as their methods / data can not be accessed
+     * outside of this class due to non-public types (Uid, Proc, etc.)
+     */
+    private SparseArray<? extends Object> m_uidStats = null;
+
     /**
-	 * Default cctor
-	 */
-	private BatteryStatsProxy(Context context) 
-	{
-		/*
+     * An instance to the UidNameResolver
+     */
+    private UidNameResolver m_nameResolver;
+    private static BatteryStatsProxy m_proxy = null;
+
+    synchronized public static BatteryStatsProxy getInstance(Context ctx) {
+        if (m_proxy == null) {
+            m_proxy = new BatteryStatsProxy(ctx);
+        }
+
+        return m_proxy;
+    }
+
+    public void invalidate() {
+        m_proxy = null;
+    }
+
+    /**
+     * Default cctor
+     */
+    private BatteryStatsProxy(Context context) {        /*
 		 * As BatteryStats is a service we need to get a binding using the IBatteryStats.Stub.getStatistics()
 		 * method (using reflection).
 		 * If we would be using a public API the code would look like:
@@ -126,1731 +112,1527 @@ private BatteryStatsProxy(Context context)
          *  }
          * }
 		 */
-		
-		m_nameResolver = new UidNameResolver();
-		
-		try
-		{
-	          ClassLoader cl = context.getClassLoader();
-	          
-	          m_ClassDefinition = cl.loadClass("com.android.internal.os.BatteryStatsImpl");
-	          
-	          // get the IBinder to the "batteryinfo" service
-	          @SuppressWarnings("rawtypes")
-			  Class serviceManagerClass = cl.loadClass("android.os.ServiceManager");
-	          
-	          // parameter types
-	          @SuppressWarnings("rawtypes")
-			  Class[] paramTypesGetService= new Class[1];
-	          paramTypesGetService[0]= String.class;
-	          
-	          @SuppressWarnings("unchecked")
-			  Method methodGetService = serviceManagerClass.getMethod("getService", paramTypesGetService);
-	          
-	          // parameters
-	          Object[] paramsGetService= new Object[1];
-	          paramsGetService[0] = "batteryinfo";
-	     
-	          Log.i(TAG, "invoking android.os.ServiceManager.getService(\"batteryinfo\")");
-	          IBinder serviceBinder = (IBinder) methodGetService.invoke(serviceManagerClass, paramsGetService); 
-
-	          Log.i(TAG, "android.os.ServiceManager.getService(\"batteryinfo\") returned a service binder");
-	          // now we have a binder. Let's us that on IBatteryStats.Stub.asInterface
-	          // to get an IBatteryStats
-	          // Note the $-syntax here as Stub is a nested class
-	          @SuppressWarnings("rawtypes")
-			  Class iBatteryStatsStub = cl.loadClass("com.android.internal.app.IBatteryStats$Stub");
-
-	          //Parameters Types
-	          @SuppressWarnings("rawtypes")
-			  Class[] paramTypesAsInterface= new Class[1];
-	          paramTypesAsInterface[0]= IBinder.class;
-
-	          @SuppressWarnings("unchecked")
-			  Method methodAsInterface = iBatteryStatsStub.getMethod("asInterface", paramTypesAsInterface);
-
-	          // Parameters
-	          Object[] paramsAsInterface= new Object[1];
-	          paramsAsInterface[0] = serviceBinder;
-	          	          
-	          Log.i(TAG, "invoking com.android.internal.app.IBatteryStats$Stub.asInterface");
-	          Object iBatteryStatsInstance = methodAsInterface.invoke(iBatteryStatsStub, paramsAsInterface);
-	          
-	          // and finally we call getStatistics from that IBatteryStats to obtain a Parcel
-	          @SuppressWarnings("rawtypes")
-			  Class iBatteryStats = cl.loadClass("com.android.internal.app.IBatteryStats");
-	          
-	          @SuppressWarnings("unchecked")
-	          Method methodGetStatistics = iBatteryStats.getMethod("getStatistics");
-	          
-	          Log.i(TAG, "invoking getStatistics");
-	          byte[] data = (byte[]) methodGetStatistics.invoke(iBatteryStatsInstance);
-	          
-	          Log.i(TAG, "retrieving parcel");
-	          
-	          Parcel parcel = Parcel.obtain();
-	          parcel.unmarshall(data, 0, data.length);
-	          parcel.setDataPosition(0);
-	          
-	          @SuppressWarnings("rawtypes")
-			  Class batteryStatsImpl = cl.loadClass("com.android.internal.os.BatteryStatsImpl");
-
-	          Log.i(TAG, "reading CREATOR field");
-	          Field creatorField = batteryStatsImpl.getField("CREATOR");
-	          
-	          // From here on we don't need reflection anymore
-	          @SuppressWarnings("rawtypes")
-			  Parcelable.Creator batteryStatsImpl_CREATOR = (Parcelable.Creator) creatorField.get(batteryStatsImpl); 
-	          
-	          m_Instance = batteryStatsImpl_CREATOR.createFromParcel(parcel);        
-	    }
-		catch( Exception e )
-		{
-			if (e instanceof InvocationTargetException && e.getCause() != null) {
-				Log.e("TAG", "An exception occured in BatteryStatsProxy(). Message: " + e.getCause().getMessage());
-			} else {
-				Log.e("TAG", "An exception occured in BatteryStatsProxy(). Message: " + e.getMessage());
-			}
-	    	m_Instance = null;
-	    	
-	    }    
-	}
-	
-	/**
-	 * Returns true if the proxy could not be initialized properly
-	 * @return true if the proxy wasn't initialized
-	 */
-	public boolean initFailed()
-	{
-		return m_Instance == null;
-	}
-	
-	/**
+
+        m_nameResolver = new UidNameResolver();
+
+        try {
+            ClassLoader cl = context.getClassLoader();
+
+            m_ClassDefinition = cl.loadClass("com.android.internal.os.BatteryStatsImpl");
+
+            // get the IBinder to the "batteryinfo" service
+            @SuppressWarnings("rawtypes")
+            Class serviceManagerClass = cl.loadClass("android.os.ServiceManager");
+
+            // parameter types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypesGetService = new Class[1];
+            paramTypesGetService[0] = String.class;
+
+            @SuppressWarnings("unchecked")
+            Method methodGetService = serviceManagerClass.getMethod("getService", paramTypesGetService);
+
+            // parameters
+            Object[] paramsGetService = new Object[1];
+            paramsGetService[0] = "batteryinfo";
+
+            Log.i(TAG, "invoking android.os.ServiceManager.getService(\"batteryinfo\")");
+            IBinder serviceBinder = (IBinder) methodGetService.invoke(serviceManagerClass, paramsGetService);
+
+            Log.i(TAG, "android.os.ServiceManager.getService(\"batteryinfo\") returned a service binder");
+            // now we have a binder. Let's us that on IBatteryStats.Stub.asInterface
+            // to get an IBatteryStats
+            // Note the $-syntax here as Stub is a nested class
+            @SuppressWarnings("rawtypes")
+            Class iBatteryStatsStub = cl.loadClass("com.android.internal.app.IBatteryStats$Stub");
+
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypesAsInterface = new Class[1];
+            paramTypesAsInterface[0] = IBinder.class;
+
+            @SuppressWarnings("unchecked")
+            Method methodAsInterface = iBatteryStatsStub.getMethod("asInterface", paramTypesAsInterface);
+
+            // Parameters
+            Object[] paramsAsInterface = new Object[1];
+            paramsAsInterface[0] = serviceBinder;
+
+            Log.i(TAG, "invoking com.android.internal.app.IBatteryStats$Stub.asInterface");
+            Object iBatteryStatsInstance = methodAsInterface.invoke(iBatteryStatsStub, paramsAsInterface);
+
+            // and finally we call getStatistics from that IBatteryStats to obtain a Parcel
+            @SuppressWarnings("rawtypes")
+            Class iBatteryStats = cl.loadClass("com.android.internal.app.IBatteryStats");
+
+            @SuppressWarnings("unchecked")
+            Method methodGetStatistics = iBatteryStats.getMethod("getStatistics");
+
+            Log.i(TAG, "invoking getStatistics");
+            byte[] data = (byte[]) methodGetStatistics.invoke(iBatteryStatsInstance);
+
+            Log.i(TAG, "retrieving parcel");
+
+            Parcel parcel = Parcel.obtain();
+            parcel.unmarshall(data, 0, data.length);
+            parcel.setDataPosition(0);
+
+            @SuppressWarnings("rawtypes")
+            Class batteryStatsImpl = cl.loadClass("com.android.internal.os.BatteryStatsImpl");
+
+            Log.i(TAG, "reading CREATOR field");
+            Field creatorField = batteryStatsImpl.getField("CREATOR");
+
+            // From here on we don't need reflection anymore
+            @SuppressWarnings("rawtypes")
+            Parcelable.Creator batteryStatsImpl_CREATOR = (Parcelable.Creator) creatorField.get(batteryStatsImpl);
+
+            m_Instance = batteryStatsImpl_CREATOR.createFromParcel(parcel);
+        } catch (Exception e) {
+            if (e instanceof InvocationTargetException && e.getCause() != null) {
+                Log.e("TAG", "An exception occured in BatteryStatsProxy(). Message: " + e.getCause().getMessage());
+            } else {
+                Log.e("TAG", "An exception occured in BatteryStatsProxy(). Message: " + e.getMessage());
+            }
+            m_Instance = null;
+
+        }
+    }
+
+    /**
+     * Returns true if the proxy could not be initialized properly
+     *
+     * @return true if the proxy wasn't initialized
+     */
+    public boolean initFailed() {
+        return m_Instance == null;
+    }
+
+    /**
      * Returns the total, last, or current battery realtime in microseconds.
      *
-     * @param curTime the current elapsed realtime in microseconds.
+     * @param curTime    the current elapsed realtime in microseconds.
      * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long computeBatteryRealtime(long curTime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
+    public Long computeBatteryRealtime(long curTime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[2];
-          paramTypes[0]= long.class;
-          paramTypes[1]= int.class;          
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = long.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("computeBatteryRealtime", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("computeBatteryRealtime", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new Long(curTime);
-          params[1]= new Integer(iStatsType);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new Long(curTime);
+            params[1] = new Integer(iStatsType);
 
-			ret = (Long) method.invoke(m_Instance, params);
+            ret = (Long) method.invoke(m_Instance, params);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
+    }
+
+    /**
      * Returns the total, last, or current battery realtime in microseconds.
      *
      * @param curTime the current elapsed realtime in microseconds.
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getBatteryRealtime(long curTime) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
+    public Long getBatteryRealtime(long curTime) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[1];
-          paramTypes[0]= long.class;
-         
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[1];
+            paramTypes[0] = long.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getBatteryRealtime", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[1];
-          params[0]= new Long(curTime);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getBatteryRealtime", paramTypes);
 
+            //Parameters
+            Object[] params = new Object[1];
+            params[0] = new Long(curTime);
 
-          ret= (Long) method.invoke(m_Instance, params);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+            ret = (Long) method.invoke(m_Instance, params);
+
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
+    }
+
+    /**
      * Returns the total, last, or current battery uptime in microseconds.
      *
-     * @param curTime the current elapsed realtime in microseconds.
+     * @param curTime    the current elapsed realtime in microseconds.
      * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long computeBatteryUptime(long curTime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
+    public Long computeBatteryUptime(long curTime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[2];
-          paramTypes[0]= long.class;
-          paramTypes[1]= int.class;          
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = long.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("computeBatteryUptime", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("computeBatteryUptime", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new Long(curTime);
-          params[1]= new Integer(iStatsType);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new Long(curTime);
+            params[1] = new Integer(iStatsType);
 
-          ret= (Long) method.invoke(m_Instance, params);
+            ret = (Long) method.invoke(m_Instance, params);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
+    }
+
+    /**
      * Returns the total, last, or current screen on time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getScreenOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
+    public Long getScreenOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[2];
-          paramTypes[0]= long.class;
-          paramTypes[1]= int.class;          
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = long.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getScreenOnTime", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getScreenOnTime", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new Long(batteryRealtime);
-          params[1]= new Integer(iStatsType);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new Long(batteryRealtime);
+            params[1] = new Integer(iStatsType);
 
-          ret= (Long) method.invoke(m_Instance, params);
+            ret = (Long) method.invoke(m_Instance, params);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
-     * Returns if phone is on battery.
-     *
-     * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+    }
+
+    /**
+     * @return True if phone is on battery, else otherwise
      */
-    public boolean getIsOnBattery() throws BatteryInfoUnavailableException
-	{
-    	boolean ret = true;
+    public boolean getIsOnBattery() throws BatteryInfoUnavailableException {
+        boolean ret = true;
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[2];
-          paramTypes[0]= long.class;
-          paramTypes[1]= int.class;          
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = long.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getIsOnBattery", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getIsOnBattery", paramTypes);
 
 
-          ret= (Boolean) method.invoke(m_Instance);
+            ret = (Boolean) method.invoke(m_Instance);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = true;
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
+    }
+
+    /**
      * Returns the total, last, or current phone on time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getPhoneOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
+    public Long getPhoneOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[2];
-          paramTypes[0]= long.class;
-          paramTypes[1]= int.class;          
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = long.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getPhoneOnTime", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getPhoneOnTime", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new Long(batteryRealtime);
-          params[1]= new Integer(iStatsType);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new Long(batteryRealtime);
+            params[1] = new Integer(iStatsType);
 
-          ret= (Long) method.invoke(m_Instance, params);
+            ret = (Long) method.invoke(m_Instance, params);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
+    }
+
+    /**
      * Returns the total, last, or current wifi on time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getWifiOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
+    public Long getWifiOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[2];
-          paramTypes[0]= long.class;
-          paramTypes[1]= int.class;          
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = long.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getWifiOnTime", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getWifiOnTime", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new Long(batteryRealtime);
-          params[1]= new Integer(iStatsType);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new Long(batteryRealtime);
+            params[1] = new Integer(iStatsType);
 
-          ret= (Long) method.invoke(m_Instance, params);
-          Log.i("TAG", "getWifiOnTime with params " + params[0] + " and " + params[1] +  " returned " + ret);
+            ret = (Long) method.invoke(m_Instance, params);
+            Log.i("TAG", "getWifiOnTime with params " + params[0] + " and " + params[1] + " returned " + ret);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
+    }
+
+    /**
      * Returns the total, last, or current wifi on time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getGlobalWifiRunningTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
+    public Long getGlobalWifiRunningTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[2];
-          paramTypes[0]= long.class;
-          paramTypes[1]= int.class;          
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = long.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getGlobalWifiRunningTime", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getGlobalWifiRunningTime", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new Long(batteryRealtime);
-          params[1]= new Integer(iStatsType);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new Long(batteryRealtime);
+            params[1] = new Integer(iStatsType);
 
-          ret= (Long) method.invoke(m_Instance, params);
-          Log.i("TAG", "getGlobalWifiRunningTime with params " + params[0] + " and " + params[1] +  " returned " + ret);
+            ret = (Long) method.invoke(m_Instance, params);
+            Log.i("TAG", "getGlobalWifiRunningTime with params " + params[0] + " and " + params[1] + " returned " + ret);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
+    }
+
+    /**
      * Returns the total, last, or current wifi running time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getWifiRunningTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
-
-    	this.collectUidStats();
-		if (m_uidStats != null)
-		{
-	        try
-	        {
-				
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-	            
-					@SuppressWarnings("rawtypes")
-		        	Class[] paramTypes= new Class[2];
-		        	paramTypes[0]= long.class;
-		        	paramTypes[1]= int.class;          
-	
-		        	@SuppressWarnings("unchecked")
-		        	Method method = iBatteryStatsUid.getMethod("getWifiRunningTime", paramTypes);
-	
-		        	//Parameters
-		        	Object[] params= new Object[2];
-		        	params[0]= new Long(batteryRealtime);
-		        	params[1]= new Integer(iStatsType);
-		        	
-		        	ret += (Long) method.invoke(myUid, params);
-		        	
-		        	Log.i(TAG, "getWifiRunningTime with params " + params[0] + " and " + params[1] + " returned " + ret);
-		        	
-	    	
-		        }
-	        }
-	        catch( IllegalArgumentException e )
-	        {
-	        	Log.e(TAG, "getWifiRunning threw an IllegalArgumentException: " + e.getMessage());
-	            throw e;
-	        }
-	        catch( Exception e )
-	        {
-	        	Log.e(TAG, "getWifiRunning threw an Exception: " + e.getMessage());
-	            ret = new Long(0);
-	            throw new BatteryInfoUnavailableException();
-	        }
-		}
+    public Long getWifiRunningTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            try {
+
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    @SuppressWarnings("rawtypes")
+                    Class[] paramTypes = new Class[2];
+                    paramTypes[0] = long.class;
+                    paramTypes[1] = int.class;
+
+                    @SuppressWarnings("unchecked")
+                    Method method = iBatteryStatsUid.getMethod("getWifiRunningTime", paramTypes);
+
+                    //Parameters
+                    Object[] params = new Object[2];
+                    params[0] = new Long(batteryRealtime);
+                    params[1] = new Integer(iStatsType);
+
+                    ret += (Long) method.invoke(myUid, params);
+
+                    Log.i(TAG, "getWifiRunningTime with params " + params[0] + " and " + params[1] + " returned " + ret);
+
+
+                }
+            } catch (IllegalArgumentException e) {
+                Log.e(TAG, "getWifiRunning threw an IllegalArgumentException: " + e.getMessage());
+                throw e;
+            } catch (Exception e) {
+                Log.e(TAG, "getWifiRunning threw an Exception: " + e.getMessage());
+                ret = new Long(0);
+                throw new BatteryInfoUnavailableException();
+            }
+        }
         return ret;
-	}
+    }
 
-	/**
+    /**
      * Returns the total, last, or current wifi lock time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getFullWifiLockTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
-
-    	this.collectUidStats();
-		if (m_uidStats != null)
-		{
-	        try
-	        {
-				
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-	            
-					@SuppressWarnings("rawtypes")
-		        	Class[] paramTypes= new Class[2];
-		        	paramTypes[0]= long.class;
-		        	paramTypes[1]= int.class;          
-	
-		        	@SuppressWarnings("unchecked")
-		        	Method method = iBatteryStatsUid.getMethod("getFullWifiLockTime", paramTypes);
-	
-		        	//Parameters
-		        	Object[] params= new Object[2];
-		        	params[0]= new Long(batteryRealtime);
-		        	params[1]= new Integer(iStatsType);
-	
-		        	ret += (Long) method.invoke(myUid, params);
-	    	
-		        }
-	        }
-	        catch( IllegalArgumentException e )
-	        {
-	            throw e;
-	        }
-	        catch( Exception e )
-	        {
-	            ret = new Long(0);
-	            throw new BatteryInfoUnavailableException();
-	        }
-		}
+    public Long getFullWifiLockTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            try {
+
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    @SuppressWarnings("rawtypes")
+                    Class[] paramTypes = new Class[2];
+                    paramTypes[0] = long.class;
+                    paramTypes[1] = int.class;
+
+                    @SuppressWarnings("unchecked")
+                    Method method = iBatteryStatsUid.getMethod("getFullWifiLockTime", paramTypes);
+
+                    //Parameters
+                    Object[] params = new Object[2];
+                    params[0] = new Long(batteryRealtime);
+                    params[1] = new Integer(iStatsType);
+
+                    ret += (Long) method.invoke(myUid, params);
+
+                }
+            } catch (IllegalArgumentException e) {
+                throw e;
+            } catch (Exception e) {
+                ret = new Long(0);
+                throw new BatteryInfoUnavailableException();
+            }
+        }
         return ret;
-	}
+    }
 
-	/**
+    /**
      * Returns the total, last, or current wifi scanning time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getScanWifiLockTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
-
-    	this.collectUidStats();
-		if (m_uidStats != null)
-		{
-	        try
-	        {
-				
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-	            
-					@SuppressWarnings("rawtypes")
-		        	Class[] paramTypes= new Class[2];
-		        	paramTypes[0]= long.class;
-		        	paramTypes[1]= int.class;          
-	
-		        	@SuppressWarnings("unchecked")
-		        	Method method = iBatteryStatsUid.getMethod("getScanWifiLockTime", paramTypes);
-	
-		        	//Parameters
-		        	Object[] params= new Object[2];
-		        	params[0]= new Long(batteryRealtime);
-		        	params[1]= new Integer(iStatsType);
-	
-		        	ret += (Long) method.invoke(myUid, params);
-	    	
-		        }
-	        }
-	        catch( IllegalArgumentException e )
-	        {
-	            throw e;
-	        }
-	        catch( Exception e )
-	        {
-	            ret = new Long(0);
-	            throw new BatteryInfoUnavailableException();
-	        }
-		}
+    public Long getScanWifiLockTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            try {
+
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    @SuppressWarnings("rawtypes")
+                    Class[] paramTypes = new Class[2];
+                    paramTypes[0] = long.class;
+                    paramTypes[1] = int.class;
+
+                    @SuppressWarnings("unchecked")
+                    Method method = iBatteryStatsUid.getMethod("getScanWifiLockTime", paramTypes);
+
+                    //Parameters
+                    Object[] params = new Object[2];
+                    params[0] = new Long(batteryRealtime);
+                    params[1] = new Integer(iStatsType);
+
+                    ret += (Long) method.invoke(myUid, params);
+
+                }
+            } catch (IllegalArgumentException e) {
+                throw e;
+            } catch (Exception e) {
+                ret = new Long(0);
+                throw new BatteryInfoUnavailableException();
+            }
+        }
         return ret;
-	}
+    }
 
-	/**
+    /**
      * Returns the total, last, or current wifi multicast time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getWifiMulticastTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
-
-    	this.collectUidStats();
-		if (m_uidStats != null)
-		{
-	        try
-	        {
-				
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-	            
-					@SuppressWarnings("rawtypes")
-		        	Class[] paramTypes= new Class[2];
-		        	paramTypes[0]= long.class;
-		        	paramTypes[1]= int.class;          
-	
-		        	@SuppressWarnings("unchecked")
-		        	Method method = iBatteryStatsUid.getMethod("getWifiMulticastTime", paramTypes);
-	
-		        	//Parameters
-		        	Object[] params= new Object[2];
-		        	params[0]= new Long(batteryRealtime);
-		        	params[1]= new Integer(iStatsType);
-	
-		        	ret += (Long) method.invoke(myUid, params);
-	    	
-		        }
-	        }
-	        catch( IllegalArgumentException e )
-	        {
-	            throw e;
-	        }
-	        catch( Exception e )
-	        {
-	            ret = new Long(0);
-	            throw new BatteryInfoUnavailableException();
-	        }
-		}
+    public Long getWifiMulticastTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            try {
+
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    @SuppressWarnings("rawtypes")
+                    Class[] paramTypes = new Class[2];
+                    paramTypes[0] = long.class;
+                    paramTypes[1] = int.class;
+
+                    @SuppressWarnings("unchecked")
+                    Method method = iBatteryStatsUid.getMethod("getWifiMulticastTime", paramTypes);
+
+                    //Parameters
+                    Object[] params = new Object[2];
+                    params[0] = new Long(batteryRealtime);
+                    params[1] = new Integer(iStatsType);
+
+                    ret += (Long) method.invoke(myUid, params);
+
+                }
+            } catch (IllegalArgumentException e) {
+                throw e;
+            } catch (Exception e) {
+                ret = new Long(0);
+                throw new BatteryInfoUnavailableException();
+            }
+        }
         return ret;
-	}
+    }
 
-	/**
+    /**
      * Returns the time in microseconds the phone has been running with the given data connection type.
      *
-     * @params dataType the given data connection type (@see http://www.netmite.com/android/mydroid/donut/frameworks/base/core/java/android/os/BatteryStats.java)
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @params dataType the given data connection type (@see http://www.netmite.com/android/mydroid/donut/frameworks/base/core/java/android/os/BatteryStats.java)
      */
-    public Long getPhoneDataConnectionTime(int dataType, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
-
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[3];
-          paramTypes[0]= int.class;
-          paramTypes[1]= long.class;
-          paramTypes[2]= int.class;          
-
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getPhoneDataConnectionTime", paramTypes);
-
-          //Parameters
-          Object[] params= new Object[3];
-          params[0]= new Integer(dataType);
-          params[1]= new Long(batteryRealtime);
-          params[2]= new Integer(iStatsType);
-
-          ret= (Long) method.invoke(m_Instance, params);
-          Log.i("TAG", "getPhoneDataConnectionTime with params " + params[0] + ", " + params[1] + "and " + params[2] + " returned " + ret);
-
-        }
-        catch( IllegalArgumentException e )
-        {
+    public Long getPhoneDataConnectionTime(int dataType, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
+
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[3];
+            paramTypes[0] = int.class;
+            paramTypes[1] = long.class;
+            paramTypes[2] = int.class;
+
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getPhoneDataConnectionTime", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[3];
+            params[0] = new Integer(dataType);
+            params[1] = new Long(batteryRealtime);
+            params[2] = new Integer(iStatsType);
+
+            ret = (Long) method.invoke(m_Instance, params);
+            Log.i("TAG", "getPhoneDataConnectionTime with params " + params[0] + ", " + params[1] + "and " + params[2] + " returned " + ret);
+
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
 
-	/**
+    }
+
+    /**
      * Returns the time in microseconds the phone has been running with the given signal strength.
      *
-     * @params signalStrength the given data connection type (@see http://www.netmite.com/android/mydroid/donut/frameworks/base/core/java/android/os/BatteryStats.java)
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @params signalStrength the given data connection type (@see http://www.netmite.com/android/mydroid/donut/frameworks/base/core/java/android/os/BatteryStats.java)
      */
-    public Long getPhoneSignalStrengthTime(int signalStrength, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
-
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[3];
-          paramTypes[0]= int.class;
-          paramTypes[1]= long.class;
-          paramTypes[2]= int.class;          
-
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getPhoneDataConnectionTime", paramTypes);
-
-          //Parameters
-          Object[] params= new Object[3];
-          params[0]= new Integer(signalStrength);
-          params[1]= new Long(batteryRealtime);
-          params[2]= new Integer(iStatsType);
-
-          ret= (Long) method.invoke(m_Instance, params);
-          Log.i("TAG", "getPhoneSignalStrengthTime with params " + params[0] + ", " + params[1] + "and " + params[2] + " returned " + ret);
-
-        }
-        catch( IllegalArgumentException e )
-        {
+    public Long getPhoneSignalStrengthTime(int signalStrength, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
+
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[3];
+            paramTypes[0] = int.class;
+            paramTypes[1] = long.class;
+            paramTypes[2] = int.class;
+
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getPhoneDataConnectionTime", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[3];
+            params[0] = new Integer(signalStrength);
+            params[1] = new Long(batteryRealtime);
+            params[2] = new Integer(iStatsType);
+
+            ret = (Long) method.invoke(m_Instance, params);
+            Log.i("TAG", "getPhoneSignalStrengthTime with params " + params[0] + ", " + params[1] + "and " + params[2] + " returned " + ret);
+
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
+
+    }
 
     /**
      * Returns the total, last, or current audio on time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getAudioTurnedOnTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
-
-    	this.collectUidStats();
-		if (m_uidStats != null)
-		{
-	        try
-	        {
-				
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-	            
-					@SuppressWarnings("rawtypes")
-		        	Class[] paramTypes= new Class[2];
-		        	paramTypes[0]= long.class;
-		        	paramTypes[1]= int.class;          
-	
-		        	@SuppressWarnings("unchecked")
-		        	Method method = iBatteryStatsUid.getMethod("getAudioTurnedOnTime", paramTypes);
-	
-		        	//Parameters
-		        	Object[] params= new Object[2];
-		        	params[0]= new Long(batteryRealtime);
-		        	params[1]= new Integer(iStatsType);
-	
-		        	ret += (Long) method.invoke(myUid, params);
-	    	
-		        }
-	        }
-	        catch( IllegalArgumentException e )
-	        {
-	            throw e;
-	        }
-	        catch( Exception e )
-	        {
-	            ret = new Long(0);
-	            throw new BatteryInfoUnavailableException();
-	        }
-		}
+    public Long getAudioTurnedOnTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            try {
+
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    @SuppressWarnings("rawtypes")
+                    Class[] paramTypes = new Class[2];
+                    paramTypes[0] = long.class;
+                    paramTypes[1] = int.class;
+
+                    @SuppressWarnings("unchecked")
+                    Method method = iBatteryStatsUid.getMethod("getAudioTurnedOnTime", paramTypes);
+
+                    //Parameters
+                    Object[] params = new Object[2];
+                    params[0] = new Long(batteryRealtime);
+                    params[1] = new Integer(iStatsType);
+
+                    ret += (Long) method.invoke(myUid, params);
+
+                }
+            } catch (IllegalArgumentException e) {
+                throw e;
+            } catch (Exception e) {
+                ret = new Long(0);
+                throw new BatteryInfoUnavailableException();
+            }
+        }
         return ret;
-	}
+    }
 
-	/**
+    /**
      * Returns the total, last, or current video on time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getVideoTurnedOnTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
-
-    	this.collectUidStats();
-		if (m_uidStats != null)
-		{
-	        try
-	        {
-				
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-	            
-					@SuppressWarnings("rawtypes")
-		        	Class[] paramTypes= new Class[2];
-		        	paramTypes[0]= long.class;
-		        	paramTypes[1]= int.class;          
-	
-		        	@SuppressWarnings("unchecked")
-		        	Method method = iBatteryStatsUid.getMethod("getVideoTurnedTime", paramTypes);
-	
-		        	//Parameters
-		        	Object[] params= new Object[2];
-		        	params[0]= new Long(batteryRealtime);
-		        	params[1]= new Integer(iStatsType);
-	
-		        	ret += (Long) method.invoke(myUid, params);
-	    	
-		        }
-	        }
-	        catch( IllegalArgumentException e )
-	        {
-	            throw e;
-	        }
-	        catch( Exception e )
-	        {
-	            ret = new Long(0);
-	            throw new BatteryInfoUnavailableException();
-	        }
-		}
+    public Long getVideoTurnedOnTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            try {
+
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    @SuppressWarnings("rawtypes")
+                    Class[] paramTypes = new Class[2];
+                    paramTypes[0] = long.class;
+                    paramTypes[1] = int.class;
+
+                    @SuppressWarnings("unchecked")
+                    Method method = iBatteryStatsUid.getMethod("getVideoTurnedTime", paramTypes);
+
+                    //Parameters
+                    Object[] params = new Object[2];
+                    params[0] = new Long(batteryRealtime);
+                    params[1] = new Integer(iStatsType);
+
+                    ret += (Long) method.invoke(myUid, params);
+
+                }
+            } catch (IllegalArgumentException e) {
+                throw e;
+            } catch (Exception e) {
+                ret = new Long(0);
+                throw new BatteryInfoUnavailableException();
+            }
+        }
         return ret;
-	}
+    }
 
     /**
      * Returns the total, last, or current bluetooth on time in microseconds.
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
-     * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
+     * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
-    public Long getBluetoothOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException
-	{
-    	Long ret = new Long(0);
+    public Long getBluetoothOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
+        Long ret = new Long(0);
 
-        try
-        {
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-          Class[] paramTypes= new Class[2];
-          paramTypes[0]= long.class;
-          paramTypes[1]= int.class;          
+        try {
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = long.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("getBluetoothOnTime", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getBluetoothOnTime", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new Long(batteryRealtime);
-          params[1]= new Integer(iStatsType);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new Long(batteryRealtime);
+            params[1] = new Integer(iStatsType);
 
-          ret= (Long) method.invoke(m_Instance, params);
+            ret = (Long) method.invoke(m_Instance, params);
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = new Long(0);
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
+
+    }
 
     /**
      * Return whether we are currently running on battery.
-     */	    
-	public boolean getIsOnBattery(Context context) throws BatteryInfoUnavailableException
-	{
-    	boolean ret = false;
+     */
+    public boolean getIsOnBattery(Context context) throws BatteryInfoUnavailableException {
+        boolean ret = false;
 
-        try
-        { 
-	    	@SuppressWarnings("unchecked")	
-	    	Method method = m_ClassDefinition.getMethod("getIsOnBattery");
+        try {
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getIsOnBattery");
 
-        	Boolean oRet = (Boolean) method.invoke(m_Instance);
-        	ret = oRet.booleanValue();
+            Boolean oRet = (Boolean) method.invoke(m_Instance);
+            ret = oRet.booleanValue();
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = false;
             throw new BatteryInfoUnavailableException();
-        }    
-        
+        }
+
         return ret;
-	}
-    
+    }
+
     /**
      * Returns the current battery percentage level if we are in a discharge cycle, otherwise
      * returns the level at the last plug event.
      */
-    public int getDischargeCurrentLevel() throws BatteryInfoUnavailableException
-    {
-    	int ret = 0;
+    public int getDischargeCurrentLevel() throws BatteryInfoUnavailableException {
+        int ret = 0;
 
-        try
-        {
-        	@SuppressWarnings("unchecked")
-        	Method method = m_ClassDefinition.getMethod("getDischargeCurrentLevel");
+        try {
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("getDischargeCurrentLevel");
 
-        	Integer oRet = (Integer) method.invoke(m_Instance);
-        	ret = oRet.intValue();
+            Integer oRet = (Integer) method.invoke(m_Instance);
+            ret = oRet.intValue();
 
-        }
-        catch( IllegalArgumentException e )
-        {
+        } catch (IllegalArgumentException e) {
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = 0;
             throw new BatteryInfoUnavailableException();
-        }    
-        
+        }
+
         return ret;
     }
-	
-	/**
+
+    /**
      * Initalizes the collection of history items
      */
-    public boolean startIteratingHistoryLocked() throws BatteryInfoUnavailableException
-	{
-    	Boolean ret = false;
+    public boolean startIteratingHistoryLocked() throws BatteryInfoUnavailableException {
+        Boolean ret = false;
 
-        try
-        {
-          @SuppressWarnings("unchecked")
-		  Method method = m_ClassDefinition.getMethod("startIteratingHistoryLocked");
+        try {
+            @SuppressWarnings("unchecked")
+            Method method = m_ClassDefinition.getMethod("startIteratingHistoryLocked");
 
-          ret= (Boolean) method.invoke(m_Instance);
+            ret = (Boolean) method.invoke(m_Instance);
 
-        }
-        catch( IllegalArgumentException e )
-        {
-        	Log.e("TAG", "An exception occured in startIteratingHistoryLocked(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
+        } catch (IllegalArgumentException e) {
+            Log.e("TAG", "An exception occured in startIteratingHistoryLocked(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
             throw e;
-        }
-        catch( Exception e )
-        {
+        } catch (Exception e) {
             ret = false;
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
 
-	
-	}
-    
-	/**
-	 * Collect the UidStats using reflection and store them  
-	 */
+
+    }
+
+    /**
+     * Collect the UidStats using reflection and store them
+     */
     @SuppressWarnings("unchecked")
-	private void collectUidStats()
-    {
-        try
-        {
-        	Method method = m_ClassDefinition.getMethod("getUidStats");
-        	
-        	m_uidStats = (SparseArray<? extends Object>) method.invoke(m_Instance);	
-        	
-        }
-        catch( IllegalArgumentException e )
-        {
-        	Log.e("TAG", "An exception occured in collectUidStats(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
+    private void collectUidStats() {
+        try {
+            Method method = m_ClassDefinition.getMethod("getUidStats");
+
+            m_uidStats = (SparseArray<? extends Object>) method.invoke(m_Instance);
+
+        } catch (IllegalArgumentException e) {
+            Log.e("TAG", "An exception occured in collectUidStats(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
             throw e;
+        } catch (Exception e) {
+            m_uidStats = null;
         }
-        catch( Exception e )
-        {
-        	m_uidStats = null;
-        }    
 
     }
-	
-	/**
-	 * Obtain the wakelock stats as a list of Wakelocks (@see com.asksven.android.common.privateapiproxies.Wakelock}
-	 * @param context a Context
-	 * @param iWakeType a type of wakelock @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes 
-	 * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
-	 * @return a List of Wakelock s
-	 * @throws Exception
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<Wakelock> getWakelockStats(Context context, int iWakeType, int iStatType, int iWlPctRef) throws Exception
-	{
-		// type checks
-		boolean validTypes = (BatteryStatsTypes.assertValidWakeType(iWakeType)
-				&& BatteryStatsTypes.assertValidStatType(iStatType)
-				&& BatteryStatsTypes.assertValidWakelockPctRef(iWlPctRef));
-		if (!validTypes)
-		{
-			Log.e("TAG", "Invalid WakeType or StatType");
-			throw new Exception("Invalid WakeType of StatType");
-		}
-		
-		ArrayList<Wakelock> myStats = new ArrayList<Wakelock>();
-		
-		this.collectUidStats();
-		if (m_uidStats != null)
-		{
-			long uSecBatteryTime = this.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, iStatType);
-			long uSecAwakeTime = this.computeBatteryUptime(SystemClock.elapsedRealtime() * 1000, iStatType);
-			long uSecScreenOnTime =this.getScreenOnTime(uSecBatteryTime, iStatType);
-			 
-            try
-            {			
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-	            
-					// Process wake lock usage
-					Method methodGetWakelockStats = iBatteryStatsUid.getMethod("getWakelockStats");
-
-					// Map of String, BatteryStats.Uid.Wakelock
-					Map<String, ? extends Object> wakelockStats = (Map<String, ? extends Object>)  methodGetWakelockStats.invoke(myUid);
-					
-					Method methodGetUid	= iBatteryStatsUid.getMethod("getUid");
-					Integer uid 		= (Integer) methodGetUid.invoke(myUid);
-					
-					long wakelockTime = 0;
-					int wakelockCount = 0;
-							            
-			        // Map of String, BatteryStats.Uid.Wakelock
-		            for (Map.Entry<String, ? extends Object> wakelockEntry : wakelockStats.entrySet())
-		            {
-		                // BatteryStats.Uid.Wakelock
-		            	Object wakelock = wakelockEntry.getValue();
-
-		            	@SuppressWarnings("rawtypes")
-						Class batteryStatsUidWakelock = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid$Wakelock");
-
-						//Parameters Types
-						@SuppressWarnings("rawtypes")
-						Class[] paramTypesGetWakeTime= new Class[1];
-						paramTypesGetWakeTime[0]= int.class;    
-
-						Method methodGetWakeTime = batteryStatsUidWakelock.getMethod("getWakeTime", paramTypesGetWakeTime);
-						
-						
-						//Parameters
-						Object[] paramsGetWakeTime= new Object[1];
-
-						// Partial wake locks BatteryStatsTypes.WAKE_TYPE_PARTIAL 
-						// are the ones that should normally be of interest but
-						// WAKE_TYPE_PARTIAL, WAKE_TYPE_FULL, WAKE_TYPE_WINDOW
-		                // are possible
-						paramsGetWakeTime[0]= Integer.valueOf(iWakeType);
-						
-						// BatteryStats.Timer
-						Object wakeTimer = methodGetWakeTime.invoke(wakelock, paramsGetWakeTime);
-						if (wakeTimer != null)
-						{
-			            	@SuppressWarnings("rawtypes")
-							Class iBatteryStatsTimer = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Timer");
-
-							//Parameters Types
-							@SuppressWarnings("rawtypes")
-							Class[] paramTypesGetTotalTimeLocked= new Class[2];
-							paramTypesGetTotalTimeLocked[0]= long.class;
-							paramTypesGetTotalTimeLocked[1]= int.class;    
-
-							Method methodGetTotalTimeLocked = iBatteryStatsTimer.getMethod("getTotalTimeLocked", paramTypesGetTotalTimeLocked);
-														
-							//Parameters
-							Object[] paramsGetTotalTimeLocked= new Object[2];
-							paramsGetTotalTimeLocked[0]= new Long(uSecBatteryTime);
-							paramsGetTotalTimeLocked[1]= Integer.valueOf(iStatType);
-							
-							Long wake = (Long) methodGetTotalTimeLocked.invoke(wakeTimer, paramsGetTotalTimeLocked);
+
+    /**
+     * Obtain the wakelock stats as a list of Wakelocks (@see com.asksven.android.common.privateapiproxies.Wakelock}
+     *
+     * @param context   a Context
+     * @param iWakeType a type of wakelock @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
+     * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
+     * @return a List of Wakelock s
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    public ArrayList<Wakelock> getWakelockStats(Context context, int iWakeType, int iStatType, int iWlPctRef) throws Exception {
+        // type checks
+        boolean validTypes = (BatteryStatsTypes.assertValidWakeType(iWakeType)
+                && BatteryStatsTypes.assertValidStatType(iStatType)
+                && BatteryStatsTypes.assertValidWakelockPctRef(iWlPctRef));
+        if (!validTypes) {
+            Log.e("TAG", "Invalid WakeType or StatType");
+            throw new Exception("Invalid WakeType of StatType");
+        }
+
+        ArrayList<Wakelock> myStats = new ArrayList<Wakelock>();
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            long uSecBatteryTime = this.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, iStatType);
+            long uSecAwakeTime = this.computeBatteryUptime(SystemClock.elapsedRealtime() * 1000, iStatType);
+            long uSecScreenOnTime = this.getScreenOnTime(uSecBatteryTime, iStatType);
+
+            try {
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    // Process wake lock usage
+                    Method methodGetWakelockStats = iBatteryStatsUid.getMethod("getWakelockStats");
+
+                    // Map of String, BatteryStats.Uid.Wakelock
+                    Map<String, ? extends Object> wakelockStats = (Map<String, ? extends Object>) methodGetWakelockStats.invoke(myUid);
+
+                    Method methodGetUid = iBatteryStatsUid.getMethod("getUid");
+                    Integer uid = (Integer) methodGetUid.invoke(myUid);
+
+                    long wakelockTime = 0;
+                    int wakelockCount = 0;
+
+                    // Map of String, BatteryStats.Uid.Wakelock
+                    for (Map.Entry<String, ? extends Object> wakelockEntry : wakelockStats.entrySet()) {
+                        // BatteryStats.Uid.Wakelock
+                        Object wakelock = wakelockEntry.getValue();
+
+                        @SuppressWarnings("rawtypes")
+                        Class batteryStatsUidWakelock = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid$Wakelock");
+
+                        //Parameters Types
+                        @SuppressWarnings("rawtypes")
+                        Class[] paramTypesGetWakeTime = new Class[1];
+                        paramTypesGetWakeTime[0] = int.class;
+
+                        Method methodGetWakeTime = batteryStatsUidWakelock.getMethod("getWakeTime", paramTypesGetWakeTime);
+
+
+                        //Parameters
+                        Object[] paramsGetWakeTime = new Object[1];
+
+                        // Partial wake locks BatteryStatsTypes.WAKE_TYPE_PARTIAL
+                        // are the ones that should normally be of interest but
+                        // WAKE_TYPE_PARTIAL, WAKE_TYPE_FULL, WAKE_TYPE_WINDOW
+                        // are possible
+                        paramsGetWakeTime[0] = Integer.valueOf(iWakeType);
+
+                        // BatteryStats.Timer
+                        Object wakeTimer = methodGetWakeTime.invoke(wakelock, paramsGetWakeTime);
+                        if (wakeTimer != null) {
+                            @SuppressWarnings("rawtypes")
+                            Class iBatteryStatsTimer = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Timer");
+
+                            //Parameters Types
+                            @SuppressWarnings("rawtypes")
+                            Class[] paramTypesGetTotalTimeLocked = new Class[2];
+                            paramTypesGetTotalTimeLocked[0] = long.class;
+                            paramTypesGetTotalTimeLocked[1] = int.class;
+
+                            Method methodGetTotalTimeLocked = iBatteryStatsTimer.getMethod("getTotalTimeLocked", paramTypesGetTotalTimeLocked);
+
+                            //Parameters
+                            Object[] paramsGetTotalTimeLocked = new Object[2];
+                            paramsGetTotalTimeLocked[0] = new Long(uSecBatteryTime);
+                            paramsGetTotalTimeLocked[1] = Integer.valueOf(iStatType);
+
+                            Long wake = (Long) methodGetTotalTimeLocked.invoke(wakeTimer, paramsGetTotalTimeLocked);
 //							Log.d(TAG, "Wakelocks inner: Process = " + wakelockEntry.getKey() + " wakelock [s] " + wake);
-							wakelockTime += wake;
+                            wakelockTime += wake;
 
-							//Parameters Types
-							@SuppressWarnings("rawtypes")
-							Class[] paramTypesGetCountLocked= new Class[1];
-							paramTypesGetCountLocked[0]= int.class;    
+                            //Parameters Types
+                            @SuppressWarnings("rawtypes")
+                            Class[] paramTypesGetCountLocked = new Class[1];
+                            paramTypesGetCountLocked[0] = int.class;
 
-							Method methodGetCountLocked = iBatteryStatsTimer.getMethod("getCountLocked", paramTypesGetCountLocked);
-														
-							//Parameters
-							Object[] paramsGetCountLocked= new Object[1];
-							paramsGetCountLocked[0]= new Integer(iStatType);
+                            Method methodGetCountLocked = iBatteryStatsTimer.getMethod("getCountLocked", paramTypesGetCountLocked);
 
-							Integer count = (Integer) methodGetCountLocked.invoke(wakeTimer, paramsGetCountLocked);
+                            //Parameters
+                            Object[] paramsGetCountLocked = new Object[1];
+                            paramsGetCountLocked[0] = new Integer(iStatType);
+
+                            Integer count = (Integer) methodGetCountLocked.invoke(wakeTimer, paramsGetCountLocked);
 //							Log.d(TAG, "Wakelocks inner: Process = " + wakelockEntry.getKey() + " count " + count);
-							wakelockCount += count;
+                            wakelockCount += count;
 
-		                }
+                        }
 //						else
 //						{
 //							Log.d(TAG, "Wakelocks: Process = " + wakelockEntry.getKey() + " with no Timer spotted");
 //						}
-						// convert so milliseconds
-						wakelockTime /= 1000;
-						
-						long uSec = 0;
-						switch (iWlPctRef)
-						{
-							case 0:
-								uSec = uSecBatteryTime;
-								break;
-							case 1:
-								uSec = uSecAwakeTime;
-								break;
-							case 2:
-								uSec = (uSecAwakeTime - uSecScreenOnTime);
-								break;
-						}
-						
-						Wakelock myWl = new Wakelock(iWakeType, wakelockEntry.getKey(), wakelockTime, uSec / 1000, wakelockCount);
-						
-						// opt for lazy loading: do no populate UidInfo, just uid. UidInfo will be fetched on demand
-						myWl.setUid(uid);
-						myStats.add(myWl);
+                        // convert so milliseconds
+                        wakelockTime /= 1000;
+
+                        long uSec = 0;
+                        switch (iWlPctRef) {
+                            case 0:
+                                uSec = uSecBatteryTime;
+                                break;
+                            case 1:
+                                uSec = uSecAwakeTime;
+                                break;
+                            case 2:
+                                uSec = (uSecAwakeTime - uSecScreenOnTime);
+                                break;
+                        }
+
+                        Wakelock myWl = new Wakelock(iWakeType, wakelockEntry.getKey(), wakelockTime, uSec / 1000, wakelockCount);
+
+                        // opt for lazy loading: do no populate UidInfo, just uid. UidInfo will be fetched on demand
+                        myWl.setUid(uid);
+                        myStats.add(myWl);
 
 //						Log.d(TAG, "Wakelocks: Process = " + wakelockEntry.getKey() + " wakelock [s] " + wakelockTime + ", count " + wakelockCount);
-		            }
-		        }
-            }
-            catch( Exception e )
-            {
-            	Log.e("TAG", "An exception occured in getWakelockStats(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
+                    }
+                }
+            } catch (Exception e) {
+                Log.e("TAG", "An exception occured in getWakelockStats(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
                 throw e;
             }
-		}	
-		return myStats;
-	}
-
-	/**
-	 * Obtain the wakelock stats as a list of Wakelocks (@see com.asksven.android.common.privateapiproxies.Wakelock}
-	 * @param context a Context
-	 * @param iWakeType a type of wakelock @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes 
-	 * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
-	 * @return a List of Wakelock s
-	 * @throws Exception
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<KernelWakelock> getKernelWakelockStats(Context context, int iStatType, int iWlPctRef, boolean bAlternate) throws Exception
-	{
-		// type checks
-		boolean validTypes = (BatteryStatsTypes.assertValidStatType(iStatType)
-				&& BatteryStatsTypes.assertValidWakelockPctRef(iWlPctRef));
-		if (!validTypes)
-		{
-			Log.e("TAG", "Invalid WakeType or StatType");
-			throw new Exception("Invalid WakeType or StatType");
-		}
-		
-		Log.d(TAG, "getWakelockStats was called with params "
-				+"[iStatType] = " + iStatType
-				+ "[iWlPctRef] = " + iWlPctRef);
-		
-		ArrayList<KernelWakelock> myStats = new ArrayList<KernelWakelock>();
-		
-		long uSecBatteryTime = this.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, iStatType);
-		long msSinceBoot = SystemClock.elapsedRealtime();
-		 
-        try
-        {			
-			ClassLoader cl = context.getClassLoader();
-			@SuppressWarnings("rawtypes")
-			Class iBatteryStats = cl.loadClass("com.android.internal.os.BatteryStatsImpl");
-
-			// Process wake lock usage
-			Method methodGetKernelWakelockStats = iBatteryStats.getMethod("getKernelWakelockStats");
-			
-			Class classSamplingTimer = cl.loadClass("com.android.internal.os.BatteryStatsImpl$SamplingTimer");
-
-			Field currentReportedCount  		= classSamplingTimer.getDeclaredField("mCurrentReportedCount");
-			Field currentReportedTotalTime  	= classSamplingTimer.getDeclaredField("mCurrentReportedTotalTime");
-			Field unpluggedReportedCount  		= classSamplingTimer.getDeclaredField("mUnpluggedReportedCount");
-			Field unpluggedReportedTotalTime  	= classSamplingTimer.getDeclaredField("mUnpluggedReportedTotalTime");
-			Field inDischarge  					= classSamplingTimer.getDeclaredField("mInDischarge");
-			Field trackingReportedValues  		= classSamplingTimer.getDeclaredField("mTrackingReportedValues");
-			
-			currentReportedCount.setAccessible(true);
-			currentReportedTotalTime.setAccessible(true);
-			unpluggedReportedCount.setAccessible(true);
-			unpluggedReportedTotalTime.setAccessible(true);
-			inDischarge.setAccessible(true);
-			trackingReportedValues.setAccessible(true);
-			
-			//Parameters
-			Object[] params= new Object[1];
-
-
-			// Map of String, BatteryStatsImpl.SamplingTimer
-			Map<String, ? extends Object> kernelWakelockStats = (Map<String, ? extends Object>)  methodGetKernelWakelockStats.invoke(m_Instance);
-
-					            
-	        // Map of String, BatteryStats.Uid.Wakelock
-            for (Map.Entry<String, ? extends Object> wakelockEntry : kernelWakelockStats.entrySet())
-            {
+        }
+        return myStats;
+    }
+
+    /**
+     * Obtain the wakelock stats as a list of Wakelocks (@see com.asksven.android.common.privateapiproxies.Wakelock}
+     *
+     * @param context   a Context
+     * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
+     * @return a List of Wakelock s
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    public ArrayList<KernelWakelock> getKernelWakelockStats(Context context, int iStatType, int iWlPctRef, boolean bAlternate) throws Exception {
+        // type checks
+        boolean validTypes = (BatteryStatsTypes.assertValidStatType(iStatType)
+                && BatteryStatsTypes.assertValidWakelockPctRef(iWlPctRef));
+        if (!validTypes) {
+            Log.e("TAG", "Invalid WakeType or StatType");
+            throw new Exception("Invalid WakeType or StatType");
+        }
+
+        Log.d(TAG, "getWakelockStats was called with params "
+                + "[iStatType] = " + iStatType
+                + "[iWlPctRef] = " + iWlPctRef);
+
+        ArrayList<KernelWakelock> myStats = new ArrayList<KernelWakelock>();
+
+        long uSecBatteryTime = this.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, iStatType);
+        long msSinceBoot = SystemClock.elapsedRealtime();
+
+        try {
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class iBatteryStats = cl.loadClass("com.android.internal.os.BatteryStatsImpl");
+
+            // Process wake lock usage
+            Method methodGetKernelWakelockStats = iBatteryStats.getMethod("getKernelWakelockStats");
+
+            Class classSamplingTimer = cl.loadClass("com.android.internal.os.BatteryStatsImpl$SamplingTimer");
+
+            Field currentReportedCount = classSamplingTimer.getDeclaredField("mCurrentReportedCount");
+            Field currentReportedTotalTime = classSamplingTimer.getDeclaredField("mCurrentReportedTotalTime");
+            Field unpluggedReportedCount = classSamplingTimer.getDeclaredField("mUnpluggedReportedCount");
+            Field unpluggedReportedTotalTime = classSamplingTimer.getDeclaredField("mUnpluggedReportedTotalTime");
+            Field inDischarge = classSamplingTimer.getDeclaredField("mInDischarge");
+            Field trackingReportedValues = classSamplingTimer.getDeclaredField("mTrackingReportedValues");
+
+            currentReportedCount.setAccessible(true);
+            currentReportedTotalTime.setAccessible(true);
+            unpluggedReportedCount.setAccessible(true);
+            unpluggedReportedTotalTime.setAccessible(true);
+            inDischarge.setAccessible(true);
+            trackingReportedValues.setAccessible(true);
+
+            //Parameters
+            Object[] params = new Object[1];
+
+
+            // Map of String, BatteryStatsImpl.SamplingTimer
+            Map<String, ? extends Object> kernelWakelockStats = (Map<String, ? extends Object>) methodGetKernelWakelockStats.invoke(m_Instance);
+
+
+            // Map of String, BatteryStats.Uid.Wakelock
+            for (Map.Entry<String, ? extends Object> wakelockEntry : kernelWakelockStats.entrySet()) {
                 // BatteryStats.SamplingTimer
-            	String wakelockName = wakelockEntry.getKey();
-            	Object samplingTimer = wakelockEntry.getValue();
-            	
-            	params[0]= samplingTimer;
-            	
-            	// read private fields
-            	Integer currentReportedCountVal 	= (Integer) currentReportedCount.get(params[0]);
-            	Long currentReportedTotalTimeVal 	= (Long) currentReportedTotalTime.get(params[0]);
-            	
-            	Integer unpluggedReportedCountVal 	= (Integer) unpluggedReportedCount.get(params[0]);
-            	Long unpluggedReportedTotalTimeVal 	= (Long) unpluggedReportedTotalTime.get(params[0]);
-            	
-            	Boolean inDischargeVal 				= (Boolean) inDischarge.get(params[0]);
-            	Boolean trackingReportedValuesVal 	= (Boolean) trackingReportedValues.get(params[0]);
-            	
-            	Log.d(TAG, "Kernel wakelock '" + wakelockEntry.getKey() + "'"
-            			+ " : reading fields from SampleTimer: " 
-            			+ " [currentReportedCountVal] = " + currentReportedCountVal
-            			+ " [currentReportedTotalTimeVal] = " + currentReportedTotalTimeVal
-            			+ " [unpluggedReportedCountVal] = " + unpluggedReportedCountVal
-            			+ " [mUnpluggedReportedTotalTimeVal] = " + unpluggedReportedTotalTimeVal
-            			+ " [mInDischarge] = " + inDischargeVal
-            			+ " [mTrackingReportedValues] = " + trackingReportedValuesVal);
-            	
+                String wakelockName = wakelockEntry.getKey();
+                Object samplingTimer = wakelockEntry.getValue();
+
+                params[0] = samplingTimer;
+
+                // read private fields
+                Integer currentReportedCountVal = (Integer) currentReportedCount.get(params[0]);
+                Long currentReportedTotalTimeVal = (Long) currentReportedTotalTime.get(params[0]);
+
+                Integer unpluggedReportedCountVal = (Integer) unpluggedReportedCount.get(params[0]);
+                Long unpluggedReportedTotalTimeVal = (Long) unpluggedReportedTotalTime.get(params[0]);
+
+                Boolean inDischargeVal = (Boolean) inDischarge.get(params[0]);
+                Boolean trackingReportedValuesVal = (Boolean) trackingReportedValues.get(params[0]);
+
+                Log.d(TAG, "Kernel wakelock '" + wakelockEntry.getKey() + "'"
+                        + " : reading fields from SampleTimer: "
+                        + " [currentReportedCountVal] = " + currentReportedCountVal
+                        + " [currentReportedTotalTimeVal] = " + currentReportedTotalTimeVal
+                        + " [unpluggedReportedCountVal] = " + unpluggedReportedCountVal
+                        + " [mUnpluggedReportedTotalTimeVal] = " + unpluggedReportedTotalTimeVal
+                        + " [mInDischarge] = " + inDischargeVal
+                        + " [mTrackingReportedValues] = " + trackingReportedValuesVal);
+
 //            	
 //            	@SuppressWarnings("rawtypes")
 //				Class batteryStatsSamplingTimerClass = cl.loadClass("com.android.internal.os.BatteryStatsImpl$SamplingTimer");
 
-				//Parameters Types
-				@SuppressWarnings("rawtypes")
-				Class[] paramTypesGetTotalTimeLocked= new Class[2];
-				paramTypesGetTotalTimeLocked[0]= long.class;
-				paramTypesGetTotalTimeLocked[1]= int.class;
-
-				//Parameters
-				Object[] paramGetTotalTimeLocked= new Object[2];
-				paramGetTotalTimeLocked[0]= new Long(uSecBatteryTime);
-				paramGetTotalTimeLocked[1]= new Integer(iStatType);
-				
-
-				Method methodGetTotalTimeLocked = classSamplingTimer
-						.getMethod("getTotalTimeLocked", paramTypesGetTotalTimeLocked);
-
-				//Parameters Types
-				@SuppressWarnings("rawtypes")
-				Class[] paramTypesGetCountLocked= new Class[1];
-				paramTypesGetCountLocked[0]= int.class;
-
-				//Parameters
-				Object[] paramGetCountLocked= new Object[1];
-				paramGetCountLocked[0]= new Integer(iStatType);
-
-				Method methodGetCountLocked = classSamplingTimer
-						.getMethod("getCountLocked", paramTypesGetCountLocked);
-					
-				
-				Long wake = (Long) methodGetTotalTimeLocked.invoke(samplingTimer, paramGetTotalTimeLocked);
-				
-				Integer count = (Integer) methodGetCountLocked.invoke(samplingTimer, paramGetCountLocked);
-				
-				Log.d(TAG, "Kernel wakelock: " + wakelockEntry.getKey() + " wakelock [s] " + wake / 1000
-						+ " count " + count);
-
-				// return the data depending on the method 
-				if (!bAlternate)
-				{
-					KernelWakelock myWl = new KernelWakelock(wakelockEntry.getKey(), wake / 1000, uSecBatteryTime / 1000, count);
-					myStats.add(myWl);	
-				}
-				else
-				{
-					KernelWakelock myWl = new KernelWakelock(
-							wakelockEntry.getKey(),
-							unpluggedReportedTotalTimeVal / 1000,
-							msSinceBoot,
-							unpluggedReportedCountVal);
-					myStats.add(myWl);
-				}	
+                //Parameters Types
+                @SuppressWarnings("rawtypes")
+                Class[] paramTypesGetTotalTimeLocked = new Class[2];
+                paramTypesGetTotalTimeLocked[0] = long.class;
+                paramTypesGetTotalTimeLocked[1] = int.class;
+
+                //Parameters
+                Object[] paramGetTotalTimeLocked = new Object[2];
+                paramGetTotalTimeLocked[0] = new Long(uSecBatteryTime);
+                paramGetTotalTimeLocked[1] = new Integer(iStatType);
+
+
+                Method methodGetTotalTimeLocked = classSamplingTimer
+                        .getMethod("getTotalTimeLocked", paramTypesGetTotalTimeLocked);
+
+                //Parameters Types
+                @SuppressWarnings("rawtypes")
+                Class[] paramTypesGetCountLocked = new Class[1];
+                paramTypesGetCountLocked[0] = int.class;
+
+                //Parameters
+                Object[] paramGetCountLocked = new Object[1];
+                paramGetCountLocked[0] = new Integer(iStatType);
+
+                Method methodGetCountLocked = classSamplingTimer
+                        .getMethod("getCountLocked", paramTypesGetCountLocked);
+
+
+                Long wake = (Long) methodGetTotalTimeLocked.invoke(samplingTimer, paramGetTotalTimeLocked);
+
+                Integer count = (Integer) methodGetCountLocked.invoke(samplingTimer, paramGetCountLocked);
+
+                Log.d(TAG, "Kernel wakelock: " + wakelockEntry.getKey() + " wakelock [s] " + wake / 1000
+                        + " count " + count);
+
+                // return the data depending on the method
+                if (!bAlternate) {
+                    KernelWakelock myWl = new KernelWakelock(wakelockEntry.getKey(), wake / 1000, uSecBatteryTime / 1000, count);
+                    myStats.add(myWl);
+                } else {
+                    KernelWakelock myWl = new KernelWakelock(
+                            wakelockEntry.getKey(),
+                            unpluggedReportedTotalTimeVal / 1000,
+                            msSinceBoot,
+                            unpluggedReportedCountVal);
+                    myStats.add(myWl);
+                }
             }
-        }
-        catch( Exception e )
-        {
-        	Log.e("TAG", "An exception occured in getKernelWakelockStats(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
+        } catch (Exception e) {
+            Log.e("TAG", "An exception occured in getKernelWakelockStats(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
             throw e;
         }
 
         return myStats;
-	}
-
-	/**
-	 * Obtain the process stats as a list of Processes (@see com.asksven.android.common.privateapiproxies.Process}
-	 * @param context a Context
-	 * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
-	 * @return a List of Process es
-	 * @throws Exception
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<Process> getProcessStats(Context context, int iStatType) throws Exception
-	{
-		// type checks
-		boolean validTypes = BatteryStatsTypes.assertValidStatType(iStatType);
-		if (!validTypes)
-		{
-			Log.e("TAG", "Invalid WakeType or StatType");
-			throw new Exception("Invalid StatType");
-		}
-		
-		ArrayList<Process> myStats = new ArrayList<Process>();
-		
-		this.collectUidStats();
-		if (m_uidStats != null)
-		{
-            try
-            {			
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-	            
-	            	Method methodGetProcessStats = iBatteryStatsUid.getMethod("getProcessStats");
-	            	
-	            	Method methodGetUid	= iBatteryStatsUid.getMethod("getUid");
-					Integer uid 		= (Integer) methodGetUid.invoke(myUid);
-					
-					// Map of String, BatteryStats.Uid.Proc
-					Map<String, ? extends Object> processStats = (Map<String, ? extends Object>)  methodGetProcessStats.invoke(myUid);
-					
-					if (processStats.size() > 0)
-					{
-					    for (Map.Entry<String, ? extends Object> ent : processStats.entrySet())
-					    {
-					    	if (CommonLogSettings.TRACE)
-					    	{
-					    		Log.d(TAG, "Process name = " + ent.getKey());
-					    	}
-						    // Object is a BatteryStatsTypes.Uid.Proc
-						    Object ps = ent.getValue();
-							@SuppressWarnings("rawtypes")
-							Class batteryStatsUidProc = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid$Proc");
-
-							//Parameters Types
-							@SuppressWarnings("rawtypes")
-							Class[] paramTypesGetXxxTime= new Class[1];
-							paramTypesGetXxxTime[0]= int.class; 
-							
-							Method methodGetUserTime 	= batteryStatsUidProc.getMethod("getUserTime", paramTypesGetXxxTime);
-							Method methodGetSystemTime 	= batteryStatsUidProc.getMethod("getSystemTime", paramTypesGetXxxTime);
-							Method methodGetStarts 		= batteryStatsUidProc.getMethod("getStarts", paramTypesGetXxxTime);
-	
-							//Parameters
-							Object[] paramsGetXxxTime= new Object[1];
-							paramsGetXxxTime[0]= new Integer(iStatType);
-							
-							Long userTime = (Long) methodGetUserTime.invoke(ps, paramsGetXxxTime);
-							Long systemTime = (Long) methodGetSystemTime.invoke(ps, paramsGetXxxTime);
-							Integer starts = (Integer) methodGetStarts.invoke(ps, paramsGetXxxTime);
-							
-							if (CommonLogSettings.TRACE)
-							{
-								Log.d(TAG, "UserTime = " + userTime);
-								Log.d(TAG, "SystemTime = " + systemTime);
-								Log.d(TAG, "Starts = " + starts);
-							}
-							
-							// take only the processes with CPU time
-							if ((userTime + systemTime) > 1000)
-							{
-								Process myPs = new Process(ent.getKey(), userTime, systemTime, starts);
-								// opt for lazy loading: do no populate UidInfo, just uid. UidInfo will be fetched on demand
-								myPs.setUid(uid);
-								// try resolving names
+    }
+
+    /**
+     * Obtain the process stats as a list of Processes (@see com.asksven.android.common.privateapiproxies.Process}
+     *
+     * @param context   a Context
+     * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
+     * @return a List of Process es
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    public ArrayList<Process> getProcessStats(Context context, int iStatType) throws Exception {
+        // type checks
+        boolean validTypes = BatteryStatsTypes.assertValidStatType(iStatType);
+        if (!validTypes) {
+            Log.e("TAG", "Invalid WakeType or StatType");
+            throw new Exception("Invalid StatType");
+        }
+
+        ArrayList<Process> myStats = new ArrayList<Process>();
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            try {
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    Method methodGetProcessStats = iBatteryStatsUid.getMethod("getProcessStats");
+
+                    Method methodGetUid = iBatteryStatsUid.getMethod("getUid");
+                    Integer uid = (Integer) methodGetUid.invoke(myUid);
+
+                    // Map of String, BatteryStats.Uid.Proc
+                    Map<String, ? extends Object> processStats = (Map<String, ? extends Object>) methodGetProcessStats.invoke(myUid);
+
+                    if (processStats.size() > 0) {
+                        for (Map.Entry<String, ? extends Object> ent : processStats.entrySet()) {
+                            if (CommonLogSettings.TRACE) {
+                                Log.d(TAG, "Process name = " + ent.getKey());
+                            }
+                            // Object is a BatteryStatsTypes.Uid.Proc
+                            Object ps = ent.getValue();
+                            @SuppressWarnings("rawtypes")
+                            Class batteryStatsUidProc = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid$Proc");
+
+                            //Parameters Types
+                            @SuppressWarnings("rawtypes")
+                            Class[] paramTypesGetXxxTime = new Class[1];
+                            paramTypesGetXxxTime[0] = int.class;
+
+                            Method methodGetUserTime = batteryStatsUidProc.getMethod("getUserTime", paramTypesGetXxxTime);
+                            Method methodGetSystemTime = batteryStatsUidProc.getMethod("getSystemTime", paramTypesGetXxxTime);
+                            Method methodGetStarts = batteryStatsUidProc.getMethod("getStarts", paramTypesGetXxxTime);
+
+                            //Parameters
+                            Object[] paramsGetXxxTime = new Object[1];
+                            paramsGetXxxTime[0] = new Integer(iStatType);
+
+                            Long userTime = (Long) methodGetUserTime.invoke(ps, paramsGetXxxTime);
+                            Long systemTime = (Long) methodGetSystemTime.invoke(ps, paramsGetXxxTime);
+                            Integer starts = (Integer) methodGetStarts.invoke(ps, paramsGetXxxTime);
+
+                            if (CommonLogSettings.TRACE) {
+                                Log.d(TAG, "UserTime = " + userTime);
+                                Log.d(TAG, "SystemTime = " + systemTime);
+                                Log.d(TAG, "Starts = " + starts);
+                            }
+
+                            // take only the processes with CPU time
+                            if ((userTime + systemTime) > 1000) {
+                                Process myPs = new Process(ent.getKey(), userTime, systemTime, starts);
+                                // opt for lazy loading: do no populate UidInfo, just uid. UidInfo will be fetched on demand
+                                myPs.setUid(uid);
+                                // try resolving names
 //								String myName = m_nameResolver.getLabel(context, ent.getKey());
-								
-								myStats.add(myPs);
-							}
-							else
-							{
-								if (CommonLogSettings.TRACE)
-								{
-									Log.d(TAG, "Process " + ent.getKey() + " was discarded (CPU time =0)");
-								}
-							}
-					    }		
-		            }
-		        }
-            }
-            catch( Exception e )
-            {
-            	Log.e("TAG", "An exception occured in getProcessStats(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
+
+                                myStats.add(myPs);
+                            } else {
+                                if (CommonLogSettings.TRACE) {
+                                    Log.d(TAG, "Process " + ent.getKey() + " was discarded (CPU time =0)");
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                Log.e("TAG", "An exception occured in getProcessStats(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
                 throw e;
             }
-		}	
-		return myStats;
-	}
-
-	/**
-	 * Obtain the network usage stats as a list of NetworkUsages (@see com.asksven.android.common.privateapiproxies.NetworkUsage}
-	 * @param context a Context
-	 * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
-	 * @return a List of NetworkUsage s
-	 * @throws Exception
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<NetworkUsage> getNetworkUsageStats(Context context, int iStatType) throws Exception
-	{
-		// type checks
-		boolean validTypes = BatteryStatsTypes.assertValidStatType(iStatType);
-		if (!validTypes)
-		{
-			Log.e("TAG", "Invalid WakeType or StatType");
-			throw new Exception("Invalid StatType");
-		}
-		
-		ArrayList<NetworkUsage> myStats = new ArrayList<NetworkUsage>();
-		
-		this.collectUidStats();
-		if (m_uidStats != null)
-		{
-            try
-            {			
-				ClassLoader cl = context.getClassLoader();
-				@SuppressWarnings("rawtypes")
-				Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
-				int NU = m_uidStats.size();
-		        for (int iu = 0; iu < NU; iu++)
-		        {
-		        	// Object is an instance of BatteryStats.Uid
-		            Object myUid = m_uidStats.valueAt(iu);
-
-					//Parameters Types
-					@SuppressWarnings("rawtypes")
-					Class[] paramTypesGetTcpBytesXxx= new Class[1];
-					paramTypesGetTcpBytesXxx[0]= int.class; 
-
-	            	Method methodGetTcpBytesReceived 	= iBatteryStatsUid.getMethod("getTcpBytesReceived", paramTypesGetTcpBytesXxx);
-	            	Method methodGetTcpBytesSent 		= iBatteryStatsUid.getMethod("getTcpBytesSent", paramTypesGetTcpBytesXxx);
-
-					//Parameters
-					Object[] paramGetTcpBytesXxx = new Object[1];
-					paramGetTcpBytesXxx[0]= new Integer(iStatType);
-					
-					Long tcpBytesReceived 	= (Long) methodGetTcpBytesReceived.invoke(myUid, paramGetTcpBytesXxx);
-					Long tcpBytesSent		= (Long) methodGetTcpBytesSent.invoke(myUid, paramGetTcpBytesXxx);
-
-					Method methodGetUid	= iBatteryStatsUid.getMethod("getUid");
-					Integer uid 		= (Integer) methodGetUid.invoke(myUid);
-					
-					Log.d(TAG, "Uid = " + uid + ": received:" + tcpBytesReceived + ", sent: " + tcpBytesSent);
-
-					NetworkUsage myData = new NetworkUsage(uid, tcpBytesReceived, tcpBytesSent);
-					// try resolving names
-					UidInfo myInfo = m_nameResolver.getNameForUid(context, uid);
-					myData.setUidInfo(myInfo);
-					myStats.add(myData);
-		        }
-            }
-            catch( Exception e )
-            {
+        }
+        return myStats;
+    }
+
+    /**
+     * Obtain the network usage stats as a list of NetworkUsages (@see com.asksven.android.common.privateapiproxies.NetworkUsage}
+     *
+     * @param context   a Context
+     * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
+     * @return a List of NetworkUsage s
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    public ArrayList<NetworkUsage> getNetworkUsageStats(Context context, int iStatType) throws Exception {
+        // type checks
+        boolean validTypes = BatteryStatsTypes.assertValidStatType(iStatType);
+        if (!validTypes) {
+            Log.e("TAG", "Invalid WakeType or StatType");
+            throw new Exception("Invalid StatType");
+        }
+
+        ArrayList<NetworkUsage> myStats = new ArrayList<NetworkUsage>();
+
+        this.collectUidStats();
+        if (m_uidStats != null) {
+            try {
+                ClassLoader cl = context.getClassLoader();
+                @SuppressWarnings("rawtypes")
+                Class iBatteryStatsUid = cl.loadClass("com.android.internal.os.BatteryStatsImpl$Uid");
+                int NU = m_uidStats.size();
+                for (int iu = 0; iu < NU; iu++) {
+                    // Object is an instance of BatteryStats.Uid
+                    Object myUid = m_uidStats.valueAt(iu);
+
+                    //Parameters Types
+                    @SuppressWarnings("rawtypes")
+                    Class[] paramTypesGetTcpBytesXxx = new Class[1];
+                    paramTypesGetTcpBytesXxx[0] = int.class;
+
+                    Method methodGetTcpBytesReceived = iBatteryStatsUid.getMethod("getTcpBytesReceived", paramTypesGetTcpBytesXxx);
+                    Method methodGetTcpBytesSent = iBatteryStatsUid.getMethod("getTcpBytesSent", paramTypesGetTcpBytesXxx);
+
+                    //Parameters
+                    Object[] paramGetTcpBytesXxx = new Object[1];
+                    paramGetTcpBytesXxx[0] = new Integer(iStatType);
+
+                    Long tcpBytesReceived = (Long) methodGetTcpBytesReceived.invoke(myUid, paramGetTcpBytesXxx);
+                    Long tcpBytesSent = (Long) methodGetTcpBytesSent.invoke(myUid, paramGetTcpBytesXxx);
+
+                    Method methodGetUid = iBatteryStatsUid.getMethod("getUid");
+                    Integer uid = (Integer) methodGetUid.invoke(myUid);
+
+                    Log.d(TAG, "Uid = " + uid + ": received:" + tcpBytesReceived + ", sent: " + tcpBytesSent);
+
+                    NetworkUsage myData = new NetworkUsage(uid, tcpBytesReceived, tcpBytesSent);
+                    // try resolving names
+                    UidInfo myInfo = m_nameResolver.getNameForUid(context, uid);
+                    myData.setUidInfo(myInfo);
+                    myStats.add(myData);
+                }
+            } catch (Exception e) {
                 throw e;
             }
-		}	
-		return myStats;
-	}
-	
-
-	/**
-	 * Obtain the network usage stats as a list of NetworkUsages (@see com.asksven.android.common.privateapiproxies.NetworkUsage}
-	 * @param context a Context
-	 * @param iStatType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
-	 * @return a List of NetworkUsage s
-	 * @throws Exception
-	 */
-    public ArrayList<NetworkUsage> getKernelNetworkStats(int iStatsType)
-	{
-
-		ArrayList<NetworkUsage> myRet = new ArrayList<NetworkUsage>(); 
-		try
-		{
-			@SuppressWarnings("unchecked")
-			// we must use getDeclaredMethod as that method is private
-			Method method = m_ClassDefinition.getDeclaredMethod("getNetworkStatsDetailGroupedByUid");
-			method.setAccessible(true);
-	
-			Object networkStats = method.invoke(m_Instance);
-			String myRes = "tada";
-		}
-		catch (Exception e)
-		{
-			myRet = null;
-		}
+        }
+        return myStats;
+    }
+
+
+    /**
+     * Obtain the network usage stats as a list of NetworkUsages (@see com.asksven.android.common.privateapiproxies.NetworkUsage}
+     *
+     * @param iStatsType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
+     * @return a List of NetworkUsage s
+     * @throws Exception
+     */
+    public ArrayList<NetworkUsage> getKernelNetworkStats(int iStatsType) {
+
+        ArrayList<NetworkUsage> myRet = new ArrayList<NetworkUsage>();
+        try {
+            @SuppressWarnings("unchecked")
+            // we must use getDeclaredMethod as that method is private
+                    Method method = m_ClassDefinition.getDeclaredMethod("getNetworkStatsDetailGroupedByUid");
+            method.setAccessible(true);
+
+            Object networkStats = method.invoke(m_Instance);
+            String myRes = "tada";
+        } catch (Exception e) {
+            myRet = null;
+        }
         return myRet;
 
-	
-	}
-	
-	@SuppressWarnings("unchecked")
-	public ArrayList<HistoryItem> getHistory(Context context) throws Exception
-	{
-		
-		ArrayList<HistoryItem> myStats = new ArrayList<HistoryItem>();
-	        	 
-        try
-        {			
-			ClassLoader cl = context.getClassLoader();
-			@SuppressWarnings("rawtypes")
-			Class classHistoryItem = cl.loadClass("android.os.BatteryStats$HistoryItem");
-												   
-			
-			// get constructor
-			Constructor cctor = classHistoryItem.getConstructor();
-			
-			Object myHistoryItem = cctor.newInstance();
-
-			// prepare the method call for getNextHistoryItem
-			//Parameters Types
-			@SuppressWarnings("rawtypes")
-			Class[] paramTypes= new Class[1];
-			paramTypes[0]= classHistoryItem;
-
-
-			@SuppressWarnings("unchecked")
-			Method methodNext = m_ClassDefinition.getMethod("getNextHistoryLocked", paramTypes);
-
-			//Parameters
-			Object[] params= new Object[1];
-
-			// initalize hist and iterate like this
-			// if (stats.startIteratingHistoryLocked()) {
+
+    }
+
+    @SuppressWarnings("unchecked")
+    public ArrayList<HistoryItem> getHistory(Context context) throws Exception {
+
+        ArrayList<HistoryItem> myStats = new ArrayList<HistoryItem>();
+
+        try {
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class classHistoryItem = cl.loadClass("android.os.BatteryStats$HistoryItem");
+
+
+            // get constructor
+            Constructor cctor = classHistoryItem.getConstructor();
+
+            Object myHistoryItem = cctor.newInstance();
+
+            // prepare the method call for getNextHistoryItem
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[1];
+            paramTypes[0] = classHistoryItem;
+
+
+            @SuppressWarnings("unchecked")
+            Method methodNext = m_ClassDefinition.getMethod("getNextHistoryLocked", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[1];
+
+            // initalize hist and iterate like this
+            // if (stats.startIteratingHistoryLocked()) {
             // final HistoryItem rec = new HistoryItem();
             // while (stats.getNextHistoryLocked(rec)) {
-			
-			// read the time of query for history
-	        Long statTimeRef = Long.valueOf(this.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000,
-	                BatteryStatsTypes.STATS_SINCE_CHARGED));
-	        statTimeRef = System.currentTimeMillis(); 
-	        
-	        Log.d(TAG, "Reference time (" + statTimeRef + ": " + DateUtils.format(DateUtils.DATE_FORMAT_NOW, statTimeRef));
-	        // statTimeLast stores the timestamp of the last sample
-	        Long statTimeLast = Long.valueOf(0);
-	        
-			if (this.startIteratingHistoryLocked())
-			{
-				params[0]= myHistoryItem;
-				Boolean bNext = (Boolean) methodNext.invoke(m_Instance, params);
-				while (bNext)
-				{
-					// process stats: create HistoryItems from params
-					Field timeField 				= classHistoryItem.getField("time"); 			// long
-					
-					
-					Field cmdField 					= classHistoryItem.getField("cmd"); 			// byte
-					Byte cmdValue = (Byte) cmdField.get(params[0]);
-					
-					// process only valid items
-					byte updateCmd = 0;
-					
-					// ICS has a different implementation of HistoryItems constants
-					if (AndroidVersion.isIcs())
-					{
-						updateCmd = HistoryItemIcs.CMD_UPDATE;
-					}
-					else
-					{
-						updateCmd = HistoryItem.CMD_UPDATE;
-					}
-					
-					if (cmdValue == updateCmd)
-					{
-				        Field batteryLevelField 		= classHistoryItem.getField("batteryLevel"); 	// byte
-				        Field batteryStatusField 		= classHistoryItem.getField("batteryStatus"); 	// byte
-				        Field batteryHealthField 		= classHistoryItem.getField("batteryHealth"); 	// byte
-				        Field batteryPlugTypeField 		= classHistoryItem.getField("batteryPlugType"); // byte
-				        
-				        Field batteryTemperatureField 	= classHistoryItem.getField("batteryTemperature"); // char
-				        Field batteryVoltageField 		= classHistoryItem.getField("batteryVoltage"); 	// char
-				        
-				        Field statesField 				= classHistoryItem.getField("states"); 			// int
-				        
-				        // retrieve all values
-				        @SuppressWarnings("rawtypes")
-				        Long timeValue = (Long) timeField.get(params[0]);
-				        
-				        // store values only once
-				        if (!statTimeLast.equals(timeValue))
-				        {
-					        Byte batteryLevelValue = (Byte) batteryLevelField.get(params[0]);
-					        Byte batteryStatusValue = (Byte) batteryStatusField.get(params[0]);
-					        Byte batteryHealthValue = (Byte) batteryHealthField.get(params[0]);
-					        Byte batteryPlugTypeValue = (Byte) batteryPlugTypeField.get(params[0]);
-					        
-					        String batteryTemperatureValue = String.valueOf(batteryTemperatureField.get(params[0]));
-					        String batteryVoltageValue = String.valueOf(batteryVoltageField.get(params[0]));
-					        
-					        Integer statesValue = (Integer) statesField.get(params[0]);
-
-					        HistoryItem myItem = null;
-					        
-					        // ICS has a different implementation of HistoryItems constants
-							if (AndroidVersion.isIcs())
-							{
-								myItem = new HistoryItemIcs(timeValue, cmdValue, batteryLevelValue,
-						        		batteryStatusValue, batteryHealthValue, batteryPlugTypeValue,
-						        		batteryTemperatureValue, batteryVoltageValue, statesValue);
-							}
-							else
-							{
-								myItem = new HistoryItem(timeValue, cmdValue, batteryLevelValue,
-						        		batteryStatusValue, batteryHealthValue, batteryPlugTypeValue,
-						        		batteryTemperatureValue, batteryVoltageValue, statesValue);
-							}
-							
-					        myStats.add(myItem);
-					        Log.d(TAG, "Added HistoryItem " + myItem.toString());
-
-				        }
-					    // overwrite the time of the last sample
-				        statTimeLast = timeValue;
-
-					}
-					else
-					{
-						Log.d(TAG, "Skipped item");
-					}
-					
-					bNext = (Boolean) methodNext.invoke(m_Instance, params);
-				}
-				
-				// norm the time of each sample
-				// stat time last is the number of millis since
-				// the stats is being collected
-				// the ref time is a full plain time (with date)
-				Long offset = statTimeRef - statTimeLast;
-				Log.d(TAG, "Reference time (" + statTimeRef + ")" + DateUtils.format(DateUtils.DATE_FORMAT_NOW, statTimeRef));
-				
-				Log.d(TAG, "Last sample (" + statTimeLast + ")" + DateUtils.format(DateUtils.DATE_FORMAT_NOW, statTimeLast));
-				
-				Log.d(TAG, "Correcting all HistoryItem times by an offset of (" + offset + ")" + DateUtils.formatDuration(offset * 1000));
-				for (int i=0; i < myStats.size(); i++)
-				{
-					myStats.get(i).setOffset(offset);
-				}
-			}
-        }
-        catch( Exception e )
-        {
-        	Log.e("TAG", "An exception occured in getHistory(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
+
+            // read the time of query for history
+            Long statTimeRef = Long.valueOf(this.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000,
+                    BatteryStatsTypes.STATS_SINCE_CHARGED));
+            statTimeRef = System.currentTimeMillis();
+
+            Log.d(TAG, "Reference time (" + statTimeRef + ": " + DateUtils.format(DateUtils.DATE_FORMAT_NOW, statTimeRef));
+            // statTimeLast stores the timestamp of the last sample
+            Long statTimeLast = Long.valueOf(0);
+
+            if (this.startIteratingHistoryLocked()) {
+                params[0] = myHistoryItem;
+                Boolean bNext = (Boolean) methodNext.invoke(m_Instance, params);
+                while (bNext) {
+                    // process stats: create HistoryItems from params
+                    Field timeField = classHistoryItem.getField("time");             // long
+
+
+                    Field cmdField = classHistoryItem.getField("cmd");             // byte
+                    Byte cmdValue = (Byte) cmdField.get(params[0]);
+
+                    // process only valid items
+                    byte updateCmd = 0;
+
+                    // ICS has a different implementation of HistoryItems constants
+                    if (AndroidVersion.isIcsOrAbove()) {
+                        updateCmd = HistoryItemIcs.CMD_UPDATE;
+                    } else {
+                        updateCmd = HistoryItem.CMD_UPDATE;
+                    }
+
+                    if (cmdValue == updateCmd) {
+                        Field batteryLevelField = classHistoryItem.getField("batteryLevel");     // byte
+                        Field batteryStatusField = classHistoryItem.getField("batteryStatus");     // byte
+                        Field batteryHealthField = classHistoryItem.getField("batteryHealth");     // byte
+                        Field batteryPlugTypeField = classHistoryItem.getField("batteryPlugType"); // byte
+
+                        Field batteryTemperatureField = classHistoryItem.getField("batteryTemperature"); // char
+                        Field batteryVoltageField = classHistoryItem.getField("batteryVoltage");     // char
+
+                        Field statesField = classHistoryItem.getField("states");             // int
+
+                        // retrieve all values
+                        @SuppressWarnings("rawtypes")
+                        Long timeValue = (Long) timeField.get(params[0]);
+
+                        // store values only once
+                        if (!statTimeLast.equals(timeValue)) {
+                            Byte batteryLevelValue = (Byte) batteryLevelField.get(params[0]);
+                            Byte batteryStatusValue = (Byte) batteryStatusField.get(params[0]);
+                            Byte batteryHealthValue = (Byte) batteryHealthField.get(params[0]);
+                            Byte batteryPlugTypeValue = (Byte) batteryPlugTypeField.get(params[0]);
+
+                            String batteryTemperatureValue = String.valueOf(batteryTemperatureField.get(params[0]));
+                            String batteryVoltageValue = String.valueOf(batteryVoltageField.get(params[0]));
+
+                            Integer statesValue = (Integer) statesField.get(params[0]);
+
+                            HistoryItem myItem = null;
+
+                            // ICS has a different implementation of HistoryItems constants
+                            if (AndroidVersion.isIcsOrAbove()) {
+                                myItem = new HistoryItemIcs(timeValue, cmdValue, batteryLevelValue,
+                                        batteryStatusValue, batteryHealthValue, batteryPlugTypeValue,
+                                        batteryTemperatureValue, batteryVoltageValue, statesValue);
+                            } else {
+                                myItem = new HistoryItem(timeValue, cmdValue, batteryLevelValue,
+                                        batteryStatusValue, batteryHealthValue, batteryPlugTypeValue,
+                                        batteryTemperatureValue, batteryVoltageValue, statesValue);
+                            }
+
+                            myStats.add(myItem);
+                            Log.d(TAG, "Added HistoryItem " + myItem.toString());
+
+                        }
+                        // overwrite the time of the last sample
+                        statTimeLast = timeValue;
+
+                    } else {
+                        Log.d(TAG, "Skipped item");
+                    }
+
+                    bNext = (Boolean) methodNext.invoke(m_Instance, params);
+                }
+
+                // norm the time of each sample
+                // stat time last is the number of millis since
+                // the stats is being collected
+                // the ref time is a full plain time (with date)
+                Long offset = statTimeRef - statTimeLast;
+                Log.d(TAG, "Reference time (" + statTimeRef + ")" + DateUtils.format(DateUtils.DATE_FORMAT_NOW, statTimeRef));
+
+                Log.d(TAG, "Last sample (" + statTimeLast + ")" + DateUtils.format(DateUtils.DATE_FORMAT_NOW, statTimeLast));
+
+                Log.d(TAG, "Correcting all HistoryItem times by an offset of (" + offset + ")" + DateUtils.formatDuration(offset * 1000));
+                for (int i = 0; i < myStats.size(); i++) {
+                    myStats.get(i).setOffset(offset);
+                }
+            }
+        } catch (Exception e) {
+            Log.e("TAG", "An exception occured in getHistory(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
             throw e;
         }
-			
-		return myStats;
-	}
+
+        return myStats;
+    }
 
 }
 
diff --git a/src/com/asksven/android/system/AndroidVersion.java b/src/com/asksven/android/system/AndroidVersion.java
index aeec1f0..96e912f 100644
--- a/src/com/asksven/android/system/AndroidVersion.java
+++ b/src/com/asksven/android/system/AndroidVersion.java
@@ -16,44 +16,55 @@
 package com.asksven.android.system;
 
 import android.os.Build;
+
 /**
- * Handles android version detection
- * @author sven
+ * Handles android version detection with proper backwards compatibility older SDK Target Versions
  *
+ * @author sven
+ * @author pedronveloso@androidpt.com
  */
-public class AndroidVersion
-{
-	public static boolean isFroyo()
-	{
-		boolean bRet = false;
-		if (Build.VERSION.SDK_INT == Build.VERSION_CODES.FROYO)
-		{
-			bRet = true;
-		}
-		
-		return bRet;
-	}
-
-	public static boolean isGingerbread()
-	{
-		boolean bRet = false;
-		if (Build.VERSION.SDK_INT == Build.VERSION_CODES.GINGERBREAD)
-		{
-			bRet = true;
-		}
-		
-		return bRet;
-	}
-
-	public static boolean isIcs()
-	{
-		boolean bRet = false;
-		if (Build.VERSION.SDK_INT >= 14) // Build.VERSION_ICE_CREAM_SANDWICH
-		{
-			bRet = true;
-		}
-		
-		return bRet;
-	}
-	
+public class AndroidVersion {
+    public static boolean isFroyo() {
+        boolean bRet = false;
+        if (Build.VERSION.SDK_INT == 8) {
+            bRet = true;
+        }
+
+        return bRet;
+    }
+
+    public static boolean isGingerbread() {
+        boolean bRet = false;
+        // GINGERBREAD_MR1 = 10, GINGERBREAD = 9
+        if (Build.VERSION.SDK_INT == 9 || Build.VERSION.SDK_INT == 10) {
+            bRet = true;
+        }
+
+        return bRet;
+    }
+
+    public static boolean isIcs() {
+        boolean bRet = false;
+        if (Build.VERSION.SDK_INT == 14 || Build.VERSION.SDK_INT == 15) {
+            bRet = true;
+        }
+        return bRet;
+    }
+
+    public static boolean isIcsOrAbove() {
+        boolean bRet = false;
+        if (Build.VERSION.SDK_INT >= 14) {
+            bRet = true;
+        }
+        return bRet;
+    }
+
+    public static boolean isJellyBean() {
+        boolean bRet = false;
+        if (Build.VERSION.SDK_INT >= 16) {
+            bRet = true;
+        }
+        return bRet;
+    }
+
 }

From a6e71b33318e7e5c68cb6c64432017ad206d7d63 Mon Sep 17 00:00:00 2001
From: Pedro Veloso <pedro.n.veloso@gmail.com>
Date: Wed, 17 Oct 2012 11:37:07 +0100
Subject: [PATCH 2/3] fix m_details parsing

---
 .../kernelutils/NativeKernelWakelock.java     | 601 ++++++++----------
 1 file changed, 281 insertions(+), 320 deletions(-)

diff --git a/src/com/asksven/android/common/kernelutils/NativeKernelWakelock.java b/src/com/asksven/android/common/kernelutils/NativeKernelWakelock.java
index 85ff663..9acf9e1 100644
--- a/src/com/asksven/android/common/kernelutils/NativeKernelWakelock.java
+++ b/src/com/asksven/android/common/kernelutils/NativeKernelWakelock.java
@@ -16,160 +16,144 @@
 
 package com.asksven.android.common.kernelutils;
 
-import java.io.Serializable;
-import java.util.Comparator;
-import java.util.List;
-import java.lang.Math;
-
+import android.content.Context;
+import android.util.Log;
 import com.asksven.android.common.privateapiproxies.StatElement;
 import com.asksven.android.common.utils.StringUtils;
 
-import android.content.Context;
-import android.util.Log;
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * @author sven
- *
  */
-public class NativeKernelWakelock extends StatElement implements Comparable<NativeKernelWakelock>, Serializable
-{	
-	
-	// a kernel wakelock from /proc/wakelocks is of the format
-	// [name, count, expire_count, wake_count, active_since, total_time, sleep_time, max_time, last_change]
-
-	/** 
-	 * the tag for logging
-	 */
-	private static transient final String TAG = "NativeKernelWakelock";
-
-	/**
-	 * the name of the wakelock holder
-	 */
-	private String m_name;
-	
-	/**
-	 * the details (packages) for that wakelock (if any
-	 */
-	private String m_details;
-
-	/**
-	 * the count
-	 */
-	private int m_count;
-
-	/**
-	 * the expire count
-	 */
-	private int m_expireCount;
-
-	/**
-	 * the wake count
-	 */
-	private int m_wakeCount;
-
-	/**
-	 * the active_since time
-	 */
-	private long m_activeSince;
-
-	/**
-	 * the total_time
-	 */
-	private long m_ttlTime;
-	
-	/**
-	 * the sleep time
-	 */
-	private long m_sleepTime;
-
-	/**
-	 * the max time
-	 */
-	private long m_maxTime;
-
-	/**
-	 * the last change
-	 */
-	private long m_lastChange;
-
-	/**
-	 * Creates a wakelock instance
-	 * @param wakeType the type of wakelock (partial or full)
-	 * @param name the speaking name
-	 * @param duration the duration the wakelock was held
-	 * @param time the battery realtime 
-	 * @param count the number of time the wakelock was active
-	 */
-	public NativeKernelWakelock(String name, String details, int count, int expire_count, int wake_count, long active_since, long total_time, long sleep_time, long max_time, long last_change, long time)
-	{
-		// hack: remove "deleted: " from wakelock label (Siyah 1.5b6)
-		if (name.startsWith("\"deleted: "))
-		{
-			m_name = "\"" + name.split(" ")[1];
-		}
-		else
-		{
-			m_name			= name;
-		}
-		m_details 		= details;
-		m_count			= count;
-		m_expireCount	= expire_count;
-		m_wakeCount		= wake_count;
-		m_activeSince	= active_since;
-		m_ttlTime		= total_time;
-		m_sleepTime		= sleep_time;
-		m_maxTime		= max_time;
-		m_lastChange	= last_change;
-		setTotal(time);
-	}
-
-	/**
-	 * Substracts the values from a previous object
-	 * found in myList from the current Process
-	 * in order to obtain an object containing only the data since a referenc
-	 * @param myList
-	 */
-	public void substractFromRef(List<StatElement> myList )
-	{
-		if (myList != null)
-		{
-			for (int i = 0; i < myList.size(); i++)
-			{
-				try
-				{
-					NativeKernelWakelock myRef = (NativeKernelWakelock) myList.get(i);
-					if ( (this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid()) )
-					{
+public class NativeKernelWakelock extends StatElement implements Comparable<NativeKernelWakelock>, Serializable {
+
+    // a kernel wakelock from /proc/wakelocks is of the format
+    // [name, count, expire_count, wake_count, active_since, total_time, sleep_time, max_time, last_change]
+
+    /**
+     * the tag for logging
+     */
+    private static transient final String TAG = "NativeKernelWakelock";
+
+    /**
+     * the name of the wakelock holder
+     */
+    private String m_name;
+
+    /**
+     * the details (packages) for that wakelock (if any
+     */
+    private String m_details;
+
+    /**
+     * the count
+     */
+    private int m_count;
+
+    /**
+     * the expire count
+     */
+    private int m_expireCount;
+
+    /**
+     * the wake count
+     */
+    private int m_wakeCount;
+
+    /**
+     * the active_since time
+     */
+    private long m_activeSince;
+
+    /**
+     * the total_time
+     */
+    private long m_ttlTime;
+
+    /**
+     * the sleep time
+     */
+    private long m_sleepTime;
+
+    /**
+     * the max time
+     */
+    private long m_maxTime;
+
+    /**
+     * the last change
+     */
+    private long m_lastChange;
+
+    /**
+     * Creates a wakelock instance
+     *
+     * @param wakeType the type of wakelock (partial or full)
+     * @param name     the speaking name
+     * @param duration the duration the wakelock was held
+     * @param time     the battery realtime
+     * @param count    the number of time the wakelock was active
+     */
+    public NativeKernelWakelock(String name, String details, int count, int expire_count, int wake_count, long active_since, long total_time, long sleep_time, long max_time, long last_change, long time) {
+        // hack: remove "deleted: " from wakelock label (Siyah 1.5b6)
+        if (name.startsWith("\"deleted: ")) {
+            m_name = "\"" + name.split(" ")[1];
+        } else {
+            m_name = name;
+        }
+        m_details = details;
+        m_count = count;
+        m_expireCount = expire_count;
+        m_wakeCount = wake_count;
+        m_activeSince = active_since;
+        m_ttlTime = total_time;
+        m_sleepTime = sleep_time;
+        m_maxTime = max_time;
+        m_lastChange = last_change;
+        setTotal(time);
+    }
+
+    /**
+     * Substracts the values from a previous object
+     * found in myList from the current Process
+     * in order to obtain an object containing only the data since a referenc
+     *
+     * @param myList
+     */
+    public void substractFromRef(List<StatElement> myList) {
+        if (myList != null) {
+            for (StatElement aMyList : myList) {
+                try {
+                    NativeKernelWakelock myRef = (NativeKernelWakelock) aMyList;
+                    if ((this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid())) {
 //						Log.i(TAG, "Substracting " + myRef.toString() + " from " + this.toString());
-						this.m_count		-= myRef.m_count;
-						this.m_expireCount	-= myRef.m_expireCount;
-						this.m_wakeCount	-= myRef.m_wakeCount;
-						this.m_activeSince	-= myRef.m_activeSince;
-						this.m_ttlTime		-= myRef.m_ttlTime;
-						this.m_sleepTime	-= myRef.m_sleepTime;
-						this.m_maxTime		-= myRef.m_maxTime;
-						this.m_lastChange	= Math.max(this.m_lastChange, myRef.m_lastChange);
-						this.setTotal( this.getTotal() - myRef.getTotal() );
-						
-						// for kernel wakelocks we need to merge the package list (aka. fqn)
-						// we don't care about double entries here, this must be handeled in getFqn
-						if (!myRef.m_details.equals(""))
-						{
-							if (!this.m_details.equals(""))
-							{
-								this.m_details += ", " + myRef.m_details;
-							}
-							else
-							{
-								this.m_details = myRef.m_details;
-							}
-						}
-						
+                        this.m_count -= myRef.m_count;
+                        this.m_expireCount -= myRef.m_expireCount;
+                        this.m_wakeCount -= myRef.m_wakeCount;
+                        this.m_activeSince -= myRef.m_activeSince;
+                        this.m_ttlTime -= myRef.m_ttlTime;
+                        this.m_sleepTime -= myRef.m_sleepTime;
+                        this.m_maxTime -= myRef.m_maxTime;
+                        this.m_lastChange = Math.max(this.m_lastChange, myRef.m_lastChange);
+                        this.setTotal(this.getTotal() - myRef.getTotal());
+
+                        // for kernel wakelocks we need to merge the package list (aka. fqn)
+                        // we don't care about double entries here, this must be handeled in getFqn
+                        if (!myRef.m_details.equals("")) {
+                            if (!this.m_details.equals("")) {
+                                this.m_details += ", " + myRef.m_details;
+                            } else {
+                                this.m_details = myRef.m_details;
+                            }
+                        }
+
 //						Log.i(TAG, "Result: " + this.toString());
 
-						if ((m_count < 0) || (m_sleepTime < 0) || (this.getTotal() < 0))
-						{
-							Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
+                        if ((m_count < 0) || (m_sleepTime < 0) || (this.getTotal() < 0)) {
+                            Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
 //							this.m_count		= Math.max(0, this.m_count);
 //							this.m_expireCount	= Math.max(0, this.m_expireCount);
 //							this.m_wakeCount	= Math.max(0, this.m_wakeCount);
@@ -177,108 +161,95 @@ public void substractFromRef(List<StatElement> myList )
 //							this.m_ttlTime		= Math.max(0, this.m_ttlTime);
 //							this.m_sleepTime	= Math.max(0, this.m_sleepTime);
 //							this.m_maxTime		= Math.max(0, this.m_maxTime);
-						}
-					}
-				}
-				catch (ClassCastException e)
-				{
-					// just log as it is no error not to change the process
-					// being substracted from to do nothing
-					Log.e(TAG, "substractFromRef was called with a wrong list type");
-				}
-				
-			}
-		}
-	}
-
-
-	/**
-	 * @return the name
-	 */
-	public String getName()
-	{
-		return m_name;
-	}
-
-	/**
-	 * @return the duration
-	 */
-	public long getDuration()
-	{
-		return m_sleepTime;
-	}
-
-	/**
-	 * @return the count
-	 */
-	public int getCount()
-	{
-		return m_count;
-	}
-
-	/**
-	 * the expire count
-	 */
-	public int getExpireCount()
-	{
-		return m_expireCount;
-	}
-
-	/**
-	 * the wake count
-	 */
-	public int getWakeCount()
-	{
-		return m_wakeCount;
-	}
-
-	/**
-	 * the active_since time
-	 */
-	public long getActiveSince()
-	{
-		return m_activeSince;
-	}
-
-	/**
-	 * the total_time
-	 */
-	public long getTtlTime()
-	{
-		return m_ttlTime;
-	}
-	
-	/**
-	 * the sleep time
-	 */
-	public long getSleepTime()
-	{
-		return m_sleepTime;
-	}
-
-	/**
-	 * the max time
-	 */
-	public long getMaxTime()
-	{
-		return m_maxTime;
-	}
-
-	/**
-	 * the last change
-	 */
-	public long getLastChange()
-	{
-		return m_lastChange;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() 
-	{
-		return getName() + " ["
+                        }
+                    }
+                } catch (ClassCastException e) {
+                    // just log as it is no error not to change the process
+                    // being substracted from to do nothing
+                    Log.e(TAG, "substractFromRef was called with a wrong list type");
+                }
+
+            }
+        }
+    }
+
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return m_name;
+    }
+
+    /**
+     * @return the duration
+     */
+    public long getDuration() {
+        return m_sleepTime;
+    }
+
+    /**
+     * @return the count
+     */
+    public int getCount() {
+        return m_count;
+    }
+
+    /**
+     * the expire count
+     */
+    public int getExpireCount() {
+        return m_expireCount;
+    }
+
+    /**
+     * the wake count
+     */
+    public int getWakeCount() {
+        return m_wakeCount;
+    }
+
+    /**
+     * the active_since time
+     */
+    public long getActiveSince() {
+        return m_activeSince;
+    }
+
+    /**
+     * the total_time
+     */
+    public long getTtlTime() {
+        return m_ttlTime;
+    }
+
+    /**
+     * the sleep time
+     */
+    public long getSleepTime() {
+        return m_sleepTime;
+    }
+
+    /**
+     * the max time
+     */
+    public long getMaxTime() {
+        return m_maxTime;
+    }
+
+    /**
+     * the last change
+     */
+    public long getLastChange() {
+        return m_lastChange;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return getName() + " ["
 //				+ "m_name=" + m_name + ", "
 //				+ "m_count=" + m_count + ", "
 //				+ "m_expire_count=" + m_expireCount + ", "
@@ -289,83 +260,73 @@ public String toString()
 //				+ "m_max_time=" + m_maxTime + ", "
 //				+ "m_last_change=" + m_lastChange + ", "
 //				+ "m_total_time=" + m_totalTime
-				+ getData()
-				+ "]";
-	}
-	
-	 /**
+                + getData()
+                + "]";
+    }
+
+    /**
      * Compare a given Wakelock with this object.
-     * If the duration of this object is 
+     * If the duration of this object is
      * greater than the received object,
      * then this object is greater than the other.
      */
-	public int compareTo(NativeKernelWakelock o)
-	{
-		// we want to sort in descending order
-		return ((int)(o.getDuration() - this.getDuration()));
-	}
-	
-	/**
-	 * Returns the full qualified name (default, can be overwritten)
-	 * @return the full qualified name
-	 */
-	public String getFqn(Context context)
-	{
-		// we need to do some formating here as m_details may be of the form "a, b, a, c, b"
-		if (m_details.equals(""))
-		{
-			return m_details;
-		}
-		else
-		{
-			// remove any left over "(" and ")"
-			m_details.replace("(", "");
-			m_details.replace(")", "");
-			
-			// merge
-			String[] splitArray = m_details.split(", ");
-			
-			m_details = StringUtils.join(splitArray, ", ", true);
-			return m_details;
-		}
-		
-	}
-
-	/**
-	 * returns a string representation of the data
-	 */
-	public String getData()
-	{
-		return this.formatDuration(getDuration()) 
-			+ " (" + getDuration()/1000 + " s)"
-			+ " Cnt:(c/wc/ec)" + getCount() + "/" + m_wakeCount + "/" + m_expireCount
-			+ " " + this.formatRatio(getDuration(), getTotal());
-	}
-	
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = getDuration();
-		return retVal;
-	}
-	
-	public static class CountComparator implements Comparator<NativeKernelWakelock>
-	{
-		public int compare(NativeKernelWakelock a, NativeKernelWakelock b)
-		{
-			return ((int)(b.getCount() - a.getCount()));
-		}
-	}
-	
-	public static class TimeComparator implements Comparator<NativeKernelWakelock>
-	{
-		public int compare(NativeKernelWakelock a, NativeKernelWakelock b)
-		{
-			return ((int)(b.getDuration() - a.getDuration()));
-		}
-	}
+    public int compareTo(NativeKernelWakelock o) {
+        // we want to sort in descending order
+        return ((int) (o.getDuration() - this.getDuration()));
+    }
+
+    /**
+     * Returns the full qualified name (default, can be overwritten)
+     *
+     * @return the full qualified name
+     */
+    public String getFqn(Context context) {
+        // we need to do some formating here as m_details may be of the form "a, b, a, c, b"
+        if (m_details.equals("")) {
+            return m_details;
+        } else {
+            // remove any left over "(" and ")"
+            m_details = m_details.replace("(", "");
+            m_details = m_details.replace(")", "");
+
+            // merge
+            String[] splitArray = m_details.split(", ");
+
+            m_details = StringUtils.join(splitArray, ", ", true);
+            return m_details;
+        }
+
+    }
+
+    /**
+     * returns a string representation of the data
+     */
+    public String getData() {
+        return this.formatDuration(getDuration())
+                + " (" + getDuration() / 1000 + " s)"
+                + " Cnt:(c/wc/ec)" + getCount() + "/" + m_wakeCount + "/" + m_expireCount
+                + " " + this.formatRatio(getDuration(), getTotal());
+    }
+
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = getDuration();
+        return retVal;
+    }
+
+    public static class CountComparator implements Comparator<NativeKernelWakelock> {
+        public int compare(NativeKernelWakelock a, NativeKernelWakelock b) {
+            return ((int) (b.getCount() - a.getCount()));
+        }
+    }
+
+    public static class TimeComparator implements Comparator<NativeKernelWakelock> {
+        public int compare(NativeKernelWakelock a, NativeKernelWakelock b) {
+            return ((int) (b.getDuration() - a.getDuration()));
+        }
+    }
 
 }

From 4d1ca3d33aa37627435a93b476c173053cea9d6e Mon Sep 17 00:00:00 2001
From: Pedro Veloso <pedro.n.veloso@gmail.com>
Date: Wed, 17 Oct 2012 14:22:44 +0100
Subject: [PATCH 3/3] general code cleanup. proper casting Java 6 style,
 inlining variables where applicable, more javadoc fixes, removed redundant
 initializations, imports optimization, etc

---
 res/drawable-ldpi/icon.png                    | Bin 1723 -> 0 bytes
 res/drawable-mdpi/icon.png                    | Bin 2574 -> 0 bytes
 res/values/strings.xml                        |   1 +
 .../common/kernelutils/AlarmsDumpsys.java     |  35 +-
 .../android/common/kernelutils/CpuStates.java |  63 +-
 .../android/common/kernelutils/Netstats.java  |  20 +-
 .../common/kernelutils/RootDetection.java     |   4 +-
 .../android/common/kernelutils/State.java     | 208 +++--
 .../android/common/kernelutils/Wakelocks.java |  17 +-
 .../common/nameutils/UidNameResolver.java     | 221 +++---
 .../common/networkutils/DataNetwork.java      |  60 +-
 .../common/privateapiproxies/Alarm.java       | 698 ++++++++---------
 .../privateapiproxies/BatteryStatsProxy.java  | 182 +++--
 .../privateapiproxies/BatteryStatsTypes.java  | 143 ++--
 .../common/privateapiproxies/HistoryItem.java | 710 ++++++++----------
 .../privateapiproxies/HistoryItemIcs.java     | 207 +++--
 .../privateapiproxies/KernelWakelock.java     | 297 ++++----
 .../common/privateapiproxies/Misc.java        | 304 ++++----
 .../privateapiproxies/NetworkUsage.java       | 522 ++++++-------
 .../common/privateapiproxies/Process.java     | 394 +++++-----
 .../common/privateapiproxies/StatElement.java | 405 +++++-----
 .../SystemPropertiesProxy.java                | 258 +++----
 .../common/privateapiproxies/Wakelock.java    | 390 +++++-----
 .../android/common/utils/ChargerUtil.java     |  29 +-
 .../android/common/utils/DataStorage.java     | 233 +++---
 .../android/common/utils/DateUtils.java       | 244 +++---
 .../android/common/utils/GenericLogger.java   |  89 +--
 .../android/common/utils/StringUtils.java     | 146 ++--
 .../asksven/android/system/Installation.java  |  66 +-
 29 files changed, 2733 insertions(+), 3213 deletions(-)
 delete mode 100644 res/drawable-ldpi/icon.png
 delete mode 100644 res/drawable-mdpi/icon.png

diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584ec21f71cd0afc9e0993aa2209671b590c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1723
zcmV;s21NOZP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000JpNkl<ZSPAV|
zTWnNS6kYeubY6Whoj!oJloqJGA0nb5fDz@Ri3x^3On~Tz5)-4wS4_m1D8}&Nhfxy{
z69ayjV2tmmi3my*6%bHLDd3b!TbgO<OkeZ557)lsPCB=DDm0)!?#Z5e&z^J7UT5un
z&e?N;|7BtZ6qldHRz&qty;Kj?tsl+TEe4;^sTwtN^<Hc_aXON=04dx0QuR(xarQnl
z*Y$?on0m_h`QGh4&vC>ARe<Hh2}sx|ed^8SkIr5c-eKY<z@Y<$pYtcLyzu(tC*Edr
zfGVt6A|V+oDjOw3!~L}g5sYa<;YBw!cvP<gp2D9sD2mKstmNBG(}1d|`Ohi}28QFc
zd@4j8rse<%fUzQs`BO<V2!pqV3cn|URWqK1t{KpE6MB{**A-+kBUsn?3bR3hq3JMb
zGc*%gR>P91Tc8>~sHP8V>Ys(CF=aT`Sk=;|pS}XrJPb~T1dys{sdO&0YpQBSz*~us
zcN*3-J_EnE1cxrXiq*F~jZje~rkAe3vf3>;eR)3?Ox=jK*jEU7Do|T`2NqP{56w(*
zBAf)rvPB_7rsfeKd0^!CaR%BHUC$tsP9m8a!i@4&TxxzagzsYHJvblx4rRUu#0Jlz
zclZJwdC}7S3BvwaIMTiwb!98zRf|zoya>NudJkDGgEYs=q*HmC)>GExofw=92}s;l
z_YgKLUT5`<1RBwq{f)K<EkI>~I%M=gRE6d<FHDq&W)h|sStE^=^^YK)Y-gCukktCI
zyk;}6aco?&J1^Hr5X_bX_y7#KLtFtxLbEV4yat9bO7raUdvlKkyy4uvOtCUJFV~jL
z4F_gf?I6P`67*JZthLs?{Usrbgxc+9-qjV5^bjy6SJ}TU{|O*fbxYmRsk;KwbuMGF
zV~6Z!up~a*#1)Wq6hM;=nYFAZ2=_!2bp<33Og4weD-y{LCU=7y0hUbw7ZO)M(s|N=
zOdXwxqui@za+L9lLcsL(^&t=lRI|f4WUhcDzSj?k+on>)b5BP`8{u9x0-wsG%H)w^
zRU7n9FwtlfsZ<KFSWNbmYXiiN*Ok-)q-Xedoa)(!*hmY~dIHC~-a*J$h1uondA4mP
zSU)GJA(2QR7z~OFS!x0(50ooIHamrqTGLZ7%q)D~GHbL$9Xrt0`x#VKN-6Q6pnl3)
zbR>SjiSB(k8~Y5+O>dyoSI477Ly?|FR?m))C!ci%BtY!2Sst8Uri#|SFX&)8{_Ou2
z9r5p3Vz9_GY#%D>%huqp_>U}K45YGy__TE!HZA@bMxX~@{;><au~O%#R=eO1RfrvV
zN@}1b)ej(%>cGYRgH~Ih*vd7EgV7h6Pg$#$lH+5=^lj{W80p{{l+;{7_t5cv3xVUy
zl_BY4ht1JH*EEeRS{VwTC(QFIVu8zF&P8O$gJsMgsS<v<^cG8zH12ME8E3p7ArSJ)
z&M1j((`t=fkRbsyk@k;7F_7#+Brq3Ek@Z%>O35SVvBrX`Vah$Yz2-5T>-`4DJNH;N
zlSSY8-mfty+|1~*;BtTwL<Ip!$O-{6nJWXCZfj~?gGcf6rCkhL5i}!%NU#a3>z_w5
z+lRv)J28~G%ouyvca(@|{2->WsPii&79&nju7ITE6hMX4AQc{|KqZN#)aAvemg3IZ
zCr}Y+!r}JU&^>U1C2WyZC<=47itSYQ`?$5{VH?mtFMFFExfYTsfqK%*WzH@Onc#i`
zI@a|rm-WbKk{5my{mF}H>Duc$bit&yLAgFfqo2vVbm~?FeG#0F?dSP*kxSo0Ff!o@
z(C}B;r&6pa-NY4;y~5lX8g&*MYQ>yLGd^tDWC4(sGy$Ow-*!eh%xt;>ve|J1q$*w<
zh;B#cz!6l2=5bkX#nJ9PJQ`ew8t>7z$bxqf*QB=l2_UB$hK|1EIfloN-jQ=qcwChF
zYAkkyp=;FwcnUB3v0=*tMYMA(Hdy<PN`g-^IhR&%fzFN6N*#&lHK?Lk=ZxLc=3rdN
zq(e3yk0;yO+EN7N%Am(wh<K-;2jmbL8HO+Z6SBz}=uJg)0~flX15@%oImi=w^eu?^
z%t_uJK&!llk^e99-)25FLY2R~H%i2Lni{9JP+O^e)Z7~oXC_K$<<GxNRbG`8Q=NTi
znzRTYIm5)q73$E{HZP;%WJucbIzw0y6~<h{M*Cz$0Li2UlrSYKFR#RI$=`tPT2(|y
Rn%e*X002ovPDHLkV1g`*Fem^3

diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
deleted file mode 100644
index a07c69fa5a0f4da5d5efe96eea12a543154dbab6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2574
zcmV+p3i0)cP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000TqNkl<ZXa((A
zTaXl28UDI^W_OsGWtUy{!Y<c^KmeB|0kUGyGA1FG<+Tz*5iPC6veb&P)Rg5*9;h-e
z3TmlIsSioYk{F{DmNAwkFOUEcA|RU$mk^d6F3YkP_BQuRcl-T4)62|GPtQQe^5S3h
z&*?tr^nd>Q`Og{P|8RRXpj5bgrSmEzSMfBn+{{vpNxw?;5UX;iv9<g8_@RM8%EGu#
zOyw}c*6!!ybr1%fK$!Ou1DhVH>sYxy_`IQHs$i<61a_iv^L>h8s-`D(`e@|IgS*Fj
zNGM876Gf;3D8*1UX9a%v>yJKD*QkCwW2AirU(L{qNA)JghmGItc<S)8TvCJ(ixjw3
zDGP|(1X`9Un_CtJe5P6O4Tok16h-k}y%^cd)qX(~3y1&(;3R-pMJy1U42MmBECtgL
z_oL_(B#i{Bm05*qutp_76zFCKsv;ifWL$-`=mi{76bUH<88Zp5;&Y~_s+bHXMSDSF
zJckkwQy?ojfl&9Fx}jNKXK+QzP_5SD&ic<$5P277Obe~>;(H<$!ABY&g<qQoV`}XB
zymTgs1$FnL&bJu4p0VhC=8or(5d~RmWa&;lQ&x+IY&_aYq<~*13&;c!tSXaIRAEF=
zB<NcF6z2Nxz(jNa!_iZ?yY1^}3a-Li7k-IIVgR3A@f`f#Ip`ZXfIAz$i21em;CTN_
z=xEu3VAVXlcIsQuGdfb46xxDaSk?R`H2PP;NRz%=?4~pTga_dz#}k`EC}jbv!cw~B
zHsU&lZlE=|p3FXv_J;eB)>By1vJIEUj-b8%el*o|VkG)LqNx#TG>Jvj^jIte!!+RY
z)T4j$7+PoF1AkRBf}R#^T=-q|PaK1$c<4UH)H<?OK4zWQV%p-Vko~Ntr}xRbH946I
zBbJy%oM;*<Qu-v?>pq3$4WA|xtr!ZQLC=*vNE>O6E9kp+5X0eKB$6>C(lPwI@3#oY
zhS_%x7e|j!$yG?ECXmh~EH~^OeuK}+sWoJse3Z3?ha3n`MM9KvA?uqpEnBg4Q46)7
zM$p%a$@l;+O}vfvx%XjH`}a{(-HHth9!JaUwV0*VqGR48^gWNYN<&~7x)y$e!X>e`
zZ5!6KZoxbKuV9XUDI%#M1~IVh?pNSdeb~6@$y`v|yk=XK+fHxnDqnUK4&=QRNyIVf
zYbDM*cI>~qIy*a7=z7uqkw@agd(<=y-Q7L!ty_23SGdXmahO<;N=wB+j;lNm%=OHC
z<IaPt3t7R-6esQN0HcDnT?G)P?Tm0c1gJ!Dt^$bfixvcL7nF-XR{?CME762Kcc$C2
z0^CXqusEZ9EG@XXRRY=h?lWDp(5=?IC?k=XaOY^+XgMBS1rS=c1#U%~*5f!7`iWIr
zm7^!xPp7$o27|RVH8pa$a)h!jBpN8E1xL!$I)x$2C0IsF*=^G#^@5r9yhtR1D_5>y
zU|>La6h%92y4IPufI$9>Xu!@y`TaNgtg&41@PwMwBdmSm7)xAWDLoqjZ==P2#*k7!
z3o1)cVSI3KP_!?d8G^Lg0FtLXC~JYdxi|c%h~lXEixY=%VSFF@!*3&&9>(R<hk59!
zW=XvsOXl2%B`grF;AT}St~EM33K2wrmQn?+2@Y0p6+pBvrWT^^V6rHyhHhkp1z8pz
zbryOC|A-TVzh@Pjttc&ls7T$Eawdh)_?r~$O&m~viVgF=iIq(c^GhAcWD*{aheGlU
zQ|MtuY-GhO>b|iK54Cx5;s~PY5iaV1het%w`dgQFBAJ;aF<C~nc##zP@rBRelZ&>K
zImQC}(|QaCFYUm1JVfzSc)ebv=)ObI)0jwJb``<Z0-}AfLb=^g=Q+9A---7|U+2N)
zKd9DfaQ52Yps9ZGfvJGaszssZ->}Zj9J0n0Xgn*Zc(rFM9$xh_makZbm-at_v5^SW
zM1y1SW@%+FuIy*WR)i3A2N_q;(YO`O!A|Ts^%z}9ZepCj3ytlw#x%N_fNrKKtPh`<
z|1{UqF`4LxHaCQ79+E=uUXCOZ35jAMRz%R%0(P!0FMv=sk>Nr8%+Oz<nLfHjoFa)k
z@jh(Yx+=2QOc~A*As$?^lQRq)3_XjOK8~%cccZ0x1Js6YG`2CYa;IA-0bFCCGVPNr
zL2`REIf(P4`>Y^c-M9@+fz=G`q<GOZlu*|(zvf<SUix$Njqk_ab5A3#M<oK#J@_)#
zF{tIXf^lqXzDWDBuB!!Pf<XB!Bm$@iO&ma&w-a(qOl6{s9o|LdEh}1<fL$^7^H|-u
z1t+e)h<}~^0jEeP^C~Jg_vF<-^N3oHdfzhiXHHlwSd2LQxLQEw+g2#o8dP&Q$@42i
zPEox$JMwp2i=E|*xKLK(8ne@y=C5MuoQH7e;!Xzh0gHKS9qUO%VG7oKI61tVw;qp?
zT%HD|M7%DEs|AE<I}WaY;`}73!Vq_rZ9p-ZSF##4B|tSl?rMG<)t)-MGqejQhyFs1
zOYY$u$1R38AVwJR<T&GF2Y!V|ofl<qSqqf>a@v4sF5u-2289-#$**LWnyNNDwDf1(
zkUiMnw|y$tn>pQP=Vn!#|17L^5AGrjtBkN$D@v)Z7LXc5EFhLB4<;7Wehh)CMqX|W
zqsiZaO^benJ_hwa&V0ub$-_HUk**?g6fm9|!@kguU6*zhK)$qn-<3*kFrYPIaqR=V
zUaUvk>@F_89b@tHs8R!*QKY;INJ<2_U+K6Ca3e9Gsl2{qY0%a7J?uICWgHuLfj+MB
z=GkAN1&ifT#2u}B+2S#~$5jA(Qn^;H%CCmIae4AE-Dsng|Hl*Ov!z72k3ZnJs{pp|
z+pW`DDueC#mEWOf=ucJ!dTL}hzOeiS-i?m2E;`EKz4<&Lu~NnW?peqVU^@<+T3KKu
z{yrI%Qy-Z%HEvLUz}n^~m?7x`xuCtNR#L2En!T>dQtIKdS#V-Hzt3RtwTeYtmQ&dR
z6qXZvac*oc@BUYEH%@Ylv_1&tSjkbzzU6*h1(3^C`;1z;g_S<r>mOtclS?KWk2VYE
zM*oS<=C483Xc<XBH-T2(vVJUXr<9s6L8%y!+?6<f{P<XJZ|@}c0}+%-f$DVxIixSf
zyZx`_jp~RryiOnPLN6^M#a^XAPNg`KKXr{n)Ewh?38G^@b)qVL^*LP6b}_MzC^c}&
z>kW?GN|1jfh3Ro(h<KDZN|fWBj7@=)05T}o0kZov5oZ%?h%8)~*k=Yr+YBDaVOp3T
zBFg{7f(5Qr%7ttVh}3fDAw-1vQZd7!TMCkUL<sw@Rk22a=Izx=SwI*ShDAWTmANx1
kfM{AOIT6Hei<0X907#l7&=u{JbN~PV07*qoM6N<$f*QKj`~Uy|

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f7823bb..ec994d0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="hello">Hello World!</string>
     <string name="app_name">AndroidCommon</string>
+    <string name="no_superuser_perms">su rights required to access alarms are not available / were not granted</string>
 </resources>
diff --git a/src/com/asksven/android/common/kernelutils/AlarmsDumpsys.java b/src/com/asksven/android/common/kernelutils/AlarmsDumpsys.java
index f7b7f68..2ddafa8 100644
--- a/src/com/asksven/android/common/kernelutils/AlarmsDumpsys.java
+++ b/src/com/asksven/android/common/kernelutils/AlarmsDumpsys.java
@@ -24,10 +24,7 @@ public class AlarmsDumpsys {
     static final String PERMISSION_DENIED = "su rights required to access alarms are not available / were not granted";
 
     /**
-     * Returns a list of alarm value objects
-     *
-     * @return
-     * @throws Exception
+     * @return list of alarm value objects
      */
     public static ArrayList<Alarm> getAlarms() {
         ArrayList<Alarm> myAlarms = null;
@@ -58,14 +55,13 @@ public static ArrayList<Alarm> getAlarms() {
                 Alarm myAlarm = null;
 
                 // process the file
-                for (int i = 0; i < res.size(); i++) {
+                for (String re : res) {
                     // skip till start mark found
                     if (bParsing) {
                         // parse the alarms by block
-                        String line = res.get(i);
-                        Matcher mPackage = packagePattern.matcher(line);
-                        Matcher mTime = timePattern.matcher(line);
-                        Matcher mNumber = numberPattern.matcher(line);
+                        Matcher mPackage = packagePattern.matcher(re);
+                        Matcher mTime = timePattern.matcher(re);
+                        Matcher mNumber = numberPattern.matcher(re);
 
                         // first line
                         if (mPackage.find()) {
@@ -78,7 +74,7 @@ public static ArrayList<Alarm> getAlarms() {
                                 String strPackageName = mPackage.group(1);
                                 myAlarm = new Alarm(strPackageName);
                             } catch (Exception e) {
-                                Log.e(TAG, "Error: parsing error in package line (" + line + ")");
+                                Log.e(TAG, "Error: parsing error in package line (" + re + ")");
                             }
                         }
 
@@ -90,13 +86,13 @@ public static ArrayList<Alarm> getAlarms() {
                                 long nWakeups = Long.parseLong(strWakeups);
 
                                 if (myAlarm == null) {
-                                    Log.e(TAG, "Error: time line found but without alarm object (" + line + ")");
+                                    Log.e(TAG, "Error: time line found but without alarm object (" + re + ")");
                                 } else {
                                     myAlarm.setWakeups(nWakeups);
                                     nTotalCount += nWakeups;
                                 }
                             } catch (Exception e) {
-                                Log.e(TAG, "Error: parsing error in time line (" + line + ")");
+                                Log.e(TAG, "Error: parsing error in time line (" + re + ")");
                             }
                         }
 
@@ -109,17 +105,17 @@ public static ArrayList<Alarm> getAlarms() {
                                 long nNumber = Long.parseLong(strNumber);
 
                                 if (myAlarm == null) {
-                                    Log.e(TAG, "Error: number line found but without alarm object (" + line + ")");
+                                    Log.e(TAG, "Error: number line found but without alarm object (" + re + ")");
                                 } else {
                                     myAlarm.addItem(nNumber, strIntent);
                                 }
                             } catch (Exception e) {
-                                Log.e(TAG, "Error: parsing error in number line (" + line + ")");
+                                Log.e(TAG, "Error: parsing error in number line (" + re + ")");
                             }
                         }
                     } else {
                         // look for beginning
-                        Matcher line = begin.matcher(res.get(i));
+                        Matcher line = begin.matcher(re);
                         if (line.find()) {
                             bParsing = true;
                         }
@@ -143,14 +139,15 @@ public static ArrayList<Alarm> getAlarms() {
         }
 
 
-        for (int i = 0; i < myAlarms.size(); i++) {
-            myAlarms.get(i).setTotalCount(nTotalCount);
+        for (Alarm myAlarm : myAlarms) {
+            myAlarm.setTotalCount(nTotalCount);
         }
         return myAlarms;
     }
 
     static ArrayList<String> getTestData() {
-        ArrayList<String> myRet = new ArrayList<String>() {{
+
+        return new ArrayList<String>() {{
             add("Alarm Stats:");
             add("  com.google.android.gsf");
             add("  8417ms running, 204 wakeups");
@@ -199,7 +196,5 @@ static ArrayList<String> getTestData() {
             add("  446486ms running, 5584 wakeups");
             add("  5584 alarms: act=com.carl.trafficcounter.UPDATE_RUN flg=0x4");
         }};
-
-        return myRet;
     }
 }
diff --git a/src/com/asksven/android/common/kernelutils/CpuStates.java b/src/com/asksven/android/common/kernelutils/CpuStates.java
index bb018b2..2913a42 100644
--- a/src/com/asksven/android/common/kernelutils/CpuStates.java
+++ b/src/com/asksven/android/common/kernelutils/CpuStates.java
@@ -25,70 +25,61 @@
  * @author sven
  *
  */
-import java.io.InputStream;
-import java.io.InputStreamReader;
+
+import android.os.SystemClock;
+import android.util.Log;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
-import java.util.List;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 
-import com.asksven.android.common.privateapiproxies.StatElement;
+public class CpuStates {
+    private static final String TAG = "CpuStates";
 
-import android.util.Log;
-import android.os.SystemClock;
-
-public class CpuStates
-{
-	private static final String TAG = "CpuStates";
-	
     // path to sysfs
     public static final String TIME_IN_STATE_PATH = "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state";
     public static final String VERSION_PATH = "/proc/version";
 
 
-    public static ArrayList<State> getTimesInStates()
-    {
-    	ArrayList<State> states = new ArrayList<State>();
-    	long totalTime = 0;
-        try
-        {
+    public static ArrayList<State> getTimesInStates() {
+        ArrayList<State> states = new ArrayList<State>();
+        long totalTime = 0;
+        try {
             // create a buffered reader to read in the time-in-states log
-            InputStream is = new FileInputStream (TIME_IN_STATE_PATH);
-            InputStreamReader ir = new InputStreamReader (is);
-            BufferedReader br = new BufferedReader (ir);
+            InputStream is = new FileInputStream(TIME_IN_STATE_PATH);
+            InputStreamReader ir = new InputStreamReader(is);
+            BufferedReader br = new BufferedReader(ir);
 
             String line;
-            while ( (line = br.readLine ()) != null )
-            {
+            while ((line = br.readLine()) != null) {
                 // split open line and convert to Integers
-                String[] nums = line.split (" ");
-                
+                String[] nums = line.split(" ");
+
                 // duration x 10 to store ms
-                State myState = new State(Integer.parseInt(nums[0]), Long.parseLong(nums[1])*10);
+                State myState = new State(Integer.parseInt(nums[0]), Long.parseLong(nums[1]) * 10);
                 totalTime += myState.m_duration;
                 states.add(myState);
             }
 
-            is.close ();
+            is.close();
 
-        }
-        catch (Exception e)
-        {
-            Log.e (TAG, e.getMessage() );
+        } catch (Exception e) {
+            Log.e(TAG, e.getMessage());
             return null;
         }
 
         // add in sleep state
         long sleepTime = SystemClock.elapsedRealtime() - SystemClock.uptimeMillis();
-        states.add( new State(0, sleepTime));
+        states.add(new State(0, sleepTime));
         totalTime += sleepTime;
-        
+
         // store the total time in order to be able to calculate ratio
-        for (int i = 0; i < states.size(); i++ )
-        {
-        	states.get(i).setTotal(totalTime);
+        for (State state : states) {
+            state.setTotal(totalTime);
         }
-        
+
         return states;
     }
 }
\ No newline at end of file
diff --git a/src/com/asksven/android/common/kernelutils/Netstats.java b/src/com/asksven/android/common/kernelutils/Netstats.java
index 66587b7..1c8210b 100644
--- a/src/com/asksven/android/common/kernelutils/Netstats.java
+++ b/src/com/asksven/android/common/kernelutils/Netstats.java
@@ -48,7 +48,6 @@
  */
 public class Netstats {
     static final String TAG = "AlarmsDumpsys";
-    static final String PERMISSION_DENIED = "su rights required to access alarms are not available / were not granted";
 
     private static final String KEY_IDX = "idx";
     private static final String KEY_IFACE = "iface";
@@ -62,10 +61,7 @@ public class Netstats {
 
 
     /**
-     * Returns a list of alarm value objects
-     *
-     * @return
-     * @throws Exception
+     * @return list of alarm value objects
      */
     public static ArrayList<NetworkUsage> parseNetstats() {
         ArrayList<NetworkUsage> myStats = new ArrayList<NetworkUsage>();
@@ -121,8 +117,8 @@ public static ArrayList<NetworkUsage> parseNetstats() {
                 }
 
                 // set the total so that we can calculate the ratio
-                for (int i = 0; i < myStats.size(); i++) {
-                    myStats.get(i).setTotal(totalBytes);
+                for (NetworkUsage myStat : myStats) {
+                    myStat.setTotal(totalBytes);
                 }
 
             }
@@ -135,15 +131,13 @@ public static ArrayList<NetworkUsage> parseNetstats() {
     /**
      * Stats may be duplicate for one uid+iface so we sum them up
      *
-     * @param stats
-     * @param entry
-     * @return
+     * @param stats stats which should add to
+     * @param entry entry to add
+     * @return stats with added entry if applicable
      */
     static ArrayList<NetworkUsage> addToStats(ArrayList<NetworkUsage> stats, NetworkUsage entry) {
         boolean merged = false;
-        for (int i = 0; i < stats.size(); i++) {
-            NetworkUsage current = stats.get(i);
-
+        for (NetworkUsage current : stats) {
             if ((current.getuid() == entry.getuid()) && (current.getInterface().equals(entry.getInterface()))) {
                 current.addBytesReceived(entry.getBytesReceived());
                 current.addBytesSent(entry.getBytesSent());
diff --git a/src/com/asksven/android/common/kernelutils/RootDetection.java b/src/com/asksven/android/common/kernelutils/RootDetection.java
index a65341c..0d8fa6b 100644
--- a/src/com/asksven/android/common/kernelutils/RootDetection.java
+++ b/src/com/asksven/android/common/kernelutils/RootDetection.java
@@ -38,8 +38,8 @@ public static boolean hasSuRights() {
     /**
      * Checks for su with a specific command
      *
-     * @param command
-     * @return
+     * @param command command to execute as su
+     * @return True if has su, else otherwise
      */
     public static boolean hasSuRights(String command) {
 //		ExecResult res = Exec.execPrint(new String[]{"su", "-c", command});
diff --git a/src/com/asksven/android/common/kernelutils/State.java b/src/com/asksven/android/common/kernelutils/State.java
index 8143769..2e7e0e4 100644
--- a/src/com/asksven/android/common/kernelutils/State.java
+++ b/src/com/asksven/android/common/kernelutils/State.java
@@ -15,15 +15,13 @@
  */
 package com.asksven.android.common.kernelutils;
 
+import android.util.Log;
+import com.asksven.android.common.privateapiproxies.StatElement;
+
 import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.util.List;
 
-import android.util.Log;
-
-import com.asksven.android.common.privateapiproxies.Process;
-import com.asksven.android.common.privateapiproxies.StatElement;
-
 
 /**
  * Value holder for CpuState
@@ -31,134 +29,114 @@
  *
  */
 
-/** simple struct for states/time */
-public class State extends StatElement implements Comparable<State>, Serializable
-{
-	/** 
-	 * the tag for logging
-	 */
-	private transient static final String TAG = "Process";
-
-	private static final long serialVersionUID = 1L;
-	
-	public int m_freq = 0;
+/**
+ * simple struct for states/time
+ */
+public class State extends StatElement implements Comparable<State>, Serializable {
+    /**
+     * the tag for logging
+     */
+    private transient static final String TAG = "Process";
+
+    private static final long serialVersionUID = 1L;
+
+    public int m_freq = 0;
     public long m_duration = 0;
 
-    public State(int freq, long duration)
-    {
-    	m_freq 		= freq;
-    	m_duration 	= duration;
+    public State(int freq, long duration) {
+        m_freq = freq;
+        m_duration = duration;
     }
-    
-    public String getName()
-    {
-    	String ret = formatFreq(m_freq);
-    	if (ret.equals("0 kHz"))
-    	{
-    		ret = "Deep Sleep";
-    	}
-    	return ret;
+
+    public String getName() {
+        String ret = formatFreq(m_freq);
+        if (ret.equals("0 kHz")) {
+            ret = "Deep Sleep";
+        }
+        return ret;
     }
-    
-    public String toString()
-    {
-    	return getName() + " " + getData();
+
+    public String toString() {
+        return getName() + " " + getData();
     }
 
-    public String getData()
-    {
-    	return formatDuration(m_duration) + " " + this.formatRatio(m_duration, getTotal());
+    public String getData() {
+        return formatDuration(m_duration) + " " + this.formatRatio(m_duration, getTotal());
     }
 
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = m_duration;
-		return retVal;
-	}
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = m_duration;
+        return retVal;
+    }
 
     /**
      * Formats a freq in Hz in a readable form
-     * @param freqHz
-     * @return
+     *
+     * @param freqkHz frequency to format
+     * @return freq in Hz in a readable form
      */
-    String formatFreq(int freqkHz)
-    {
-    	double freq = freqkHz;
-    	double freqMHz = freq / 1000;
-    	double freqGHz = freq / 1000 / 1000;
-
-    	String formatedFreq = "";
-    	DecimalFormat df = new DecimalFormat("#.##");
-        
-    	if (freqGHz >= 1)
-    	{
-    		formatedFreq = df.format(freqGHz) + " GHz";
-    	}
-    	else if (freqMHz >= 1)
-    	{
-    		formatedFreq = df.format(freqMHz) + " MHz";
-    	}
-
-    	else
-    	{
-    		formatedFreq = df.format(freqkHz) + " kHz";
-    	}
-    	
-    	return formatedFreq;
+    String formatFreq(int freqkHz) {
+        double freqMHz = freqkHz / 1000;
+        double freqGHz = freqkHz / 1000 / 1000;
+
+        String formatedFreq = "";
+        DecimalFormat df = new DecimalFormat("#.##");
+
+        if (freqGHz >= 1) {
+            formatedFreq = df.format(freqGHz) + " GHz";
+        } else if (freqMHz >= 1) {
+            formatedFreq = df.format(freqMHz) + " MHz";
+        } else {
+            formatedFreq = df.format(freqkHz) + " kHz";
+        }
+
+        return formatedFreq;
 
     }
-    
-	/**
-	 * Substracts the values from a previous object
-	 * found in myList from the current Process
-	 * in order to obtain an object containing only the data since a referenc
-	 * @param myList
-	 */
-	public void substractFromRef(List<StatElement> myList )
-	{
-		if (myList != null)
-		{
-			for (int i = 0; i < myList.size(); i++)
-			{
-				try
-				{
-					State myRef = (State) myList.get(i);
-					if ( (this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid()) )
-					{
-						this.m_duration 	-= myRef.m_duration;
-						this.setTotal( this.getTotal() - myRef.getTotal() );
-						if (m_duration < 0)
-						{
-							Log.e(TAG, "substractFromRef generated negative values (" + this.m_duration + " - " + myRef.m_duration + ")");
-						}
-					}
-				}
-				catch (ClassCastException e)
-				{
-					// just log as it is no error not to change the process
-					// being substracted from to do nothing
-					Log.e(TAG, "substractFromRef was called with a wrong list type");
-				}
-				
-			}
-		}
-	}
-	
-	/**
+
+    /**
+     * Substracts the values from a previous object
+     * found in myList from the current Process
+     * in order to obtain an object containing only the data since a reference
+     *
+     * @param myList list with stats
+     */
+    public void substractFromRef(List<StatElement> myList) {
+        if (myList != null) {
+            for (StatElement aMyList : myList) {
+                try {
+                    State myRef = (State) aMyList;
+                    if ((this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid())) {
+                        this.m_duration -= myRef.m_duration;
+                        this.setTotal(this.getTotal() - myRef.getTotal());
+                        if (m_duration < 0) {
+                            Log.e(TAG, "substractFromRef generated negative values (" + this.m_duration + " - " + myRef.m_duration + ")");
+                        }
+                    }
+                } catch (ClassCastException e) {
+                    // just log as it is no error not to change the process
+                    // being substracted from to do nothing
+                    Log.e(TAG, "substractFromRef was called with a wrong list type");
+                }
+
+            }
+        }
+    }
+
+    /**
      * Compare a given Wakelock with this object.
-     * If the duration of this object is 
+     * If the duration of this object is
      * greater than the received object,
      * then this object is greater than the other.
      */
-	public int compareTo(State o)
-	{
-		// we want to sort in descending order
-		return ((int)( (o.m_duration) - (this.m_duration) ));
-	}
+    public int compareTo(State o) {
+        // we want to sort in descending order
+        return ((int) ((o.m_duration) - (this.m_duration)));
+    }
 
 
 }
diff --git a/src/com/asksven/android/common/kernelutils/Wakelocks.java b/src/com/asksven/android/common/kernelutils/Wakelocks.java
index 8b8118d..3831d4c 100644
--- a/src/com/asksven/android/common/kernelutils/Wakelocks.java
+++ b/src/com/asksven/android/common/kernelutils/Wakelocks.java
@@ -78,20 +78,19 @@ public static ArrayList<NativeKernelWakelock> parseProcWakelocks(Context context
 
                     if (proc != 0) {
                         // search for the process in the task list
-                        for (int psCount = 0; psCount < procInfos.size(); psCount++) {
-                            int id = procInfos.get(psCount).pid;
+                        for (RunningAppProcessInfo procInfo : procInfos) {
+                            int id = procInfo.pid;
                             if (id == proc) {
-                                String processName = procInfos.get(psCount).processName;
 
-                                details = processName;
+                                details = procInfo.processName;
                                 String appName = "";
 
                                 String[] pkgList = procInfos.get(count).pkgList;
-                                for (int j = 0; j < pkgList.length; j++) {
+                                for (String aPkgList : pkgList) {
                                     if (details.length() > 0) {
                                         details += ", ";
                                     }
-                                    details += pkgList[j];
+                                    details += aPkgList;
                                 }
 
                                 if (CommonLogSettings.DEBUG) {
@@ -123,8 +122,7 @@ private static ArrayList<String[]> parseDelimitedFile(String filePath, String de
             while ((currentRecord = br.readLine()) != null)
                 rows.add(currentRecord.split(delimiter));
             br.close();
-        } catch (Exception e) {
-
+        } catch (Exception ignored) {
         }
         return rows;
     }
@@ -144,8 +142,7 @@ public static boolean isDiscreteKwlPatch() {
                 ret = true;
             }
             br.close();
-        } catch (Exception e) {
-
+        } catch (Exception ignored) {
         }
         return ret;
     }
diff --git a/src/com/asksven/android/common/nameutils/UidNameResolver.java b/src/com/asksven/android/common/nameutils/UidNameResolver.java
index 7020c9e..94cdf63 100644
--- a/src/com/asksven/android/common/nameutils/UidNameResolver.java
+++ b/src/com/asksven/android/common/nameutils/UidNameResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 package com.asksven.android.common.nameutils;
 
 import android.content.Context;
@@ -24,166 +24,145 @@
 
 /**
  * @author sven
- *
+ *         Complemented by pedronveloso@androidpt.com
  */
-public class UidNameResolver 
-{
-	
-	protected String[] m_packages;
-	protected String[] m_packageNames;
-    
-	public String getLabel(Context context, String packageName)
-	{
-		String ret = packageName;
-		PackageManager pm = context.getPackageManager();
-        try
-        {
+public class UidNameResolver {
+
+    protected String[] m_packages;
+    protected String[] m_packageNames;
+
+    public String getLabel(Context context, String packageName) {
+        String ret = packageName;
+        PackageManager pm = context.getPackageManager();
+        try {
             ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
             CharSequence label = ai.loadLabel(pm);
-            if (label != null)
-            {
+            if (label != null) {
                 ret = label.toString();
             }
-        }
-        catch (NameNotFoundException e)
-        {
+        } catch (NameNotFoundException e) {
             ret = packageName;
         }
-        
+
         return ret;
     }
-	
-	// Side effects: sets mName and mUniqueName
-	// Sets mNamePackage, mName and mUniqueName
-    public UidInfo getNameForUid(Context context, int uid)
-    {
-    	String uidName = "";
-    	String uidNamePackage = "";
-    	boolean uidUniqueName = false;
-    	
-    	UidInfo myInfo = new UidInfo();
-    	myInfo.setUid(uid);
-    	myInfo.setName(uidName);
-    	myInfo.setNamePackage(uidNamePackage);
-    	myInfo.setUniqueName(uidUniqueName);
-
-        
+
+    // Side effects: sets mName and mUniqueName
+    // Sets mNamePackage, mName and mUniqueName
+    public UidInfo getNameForUid(Context context, int uid) {
+        String uidName = "";
+        String uidNamePackage = "";
+        boolean uidUniqueName = false;
+
+        UidInfo myInfo = new UidInfo();
+        myInfo.setUid(uid);
+        myInfo.setName(uidName);
+        myInfo.setNamePackage(uidNamePackage);
+        myInfo.setUniqueName(uidUniqueName);
+
+
         PackageManager pm = context.getPackageManager();
         m_packages = pm.getPackagesForUid(uid);
-        
-        if (m_packages == null)
-        {
+
+        if (m_packages == null) {
             uidName = Integer.toString(uid);
 
-        	myInfo.setName(uidName);
+            myInfo.setName(uidName);
             return myInfo;
         }
-        
+
         m_packageNames = new String[m_packages.length];
         System.arraycopy(m_packages, 0, m_packageNames, 0, m_packages.length);
-        
+
         // Convert package names to user-facing labels where possible
-        for (int i = 0; i < m_packageNames.length; i++)
-        {
+        for (int i = 0; i < m_packageNames.length; i++) {
             m_packageNames[i] = getLabel(context, m_packageNames[i]);
         }
 
-        if (m_packageNames.length == 1)
-        {
+        if (m_packageNames.length == 1) {
             uidNamePackage = m_packages[0];
             uidName = m_packageNames[0];
             uidUniqueName = true;
-        }
-        else
-        {
+        } else {
             uidName = "UID"; // Default name
             // Look for an official name for this UID.
-            for (String name : m_packages)
-            {
-                try
-                {
+            for (String name : m_packages) {
+                try {
                     PackageInfo pi = pm.getPackageInfo(name, 0);
-                    if (pi.sharedUserLabel != 0)
-                    {
+                    if (pi.sharedUserLabel != 0) {
                         CharSequence nm = pm.getText(name,
                                 pi.sharedUserLabel, pi.applicationInfo);
-                        if (nm != null)
-                        {
+                        if (nm != null) {
                             uidName = nm.toString();
                             break;
                         }
                     }
-                }
-                catch (PackageManager.NameNotFoundException e)
-                {
+                } catch (PackageManager.NameNotFoundException ignored) {
                 }
             }
         }
-    	myInfo.setName(uidName);
-    	myInfo.setNamePackage(uidNamePackage);
-    	myInfo.setUniqueName(uidUniqueName);
+        myInfo.setName(uidName);
+        myInfo.setNamePackage(uidNamePackage);
+        myInfo.setUniqueName(uidUniqueName);
 
-    	return myInfo;
+        return myInfo;
     }
-    
+
     /**
-     * Returns the name for UIDs < 2000
-     * @param uid
-     * @return
+     * @param uid process UID
+     * @return name for UIDs < 2000
      */
-    String getName(int uid)
-    {
-    	String ret = "";
-    	switch (uid)
-    	{
-    		case 0:
-    			ret = "root";
-    			break;
-    		case 1000:
-    			ret = "system";
-    			break;
-    		case 1001:
-    			ret = "radio";
-    			break;
-    		case 1002:
-    			ret = "bluetooth";
-    			break;
-    		case 1003:
-    			ret = "graphics";
-    			break;
-    		case 1004:
-    			ret = "input";
-    			break;
-    		case 1005:
-    			ret = "audio";
-    			break;
-    		case 1006:
-    			ret = "camera";
-    			break;
-    		case 1007:
-    			ret = "log";
-    			break;
-    		case 1008:
-    			ret = "compass";
-    			break;
-    		case 1009:
-    			ret = "mount";
-    			break;
-    		case 1010:
-    			ret = "wifi";
-    			break;
-    		case 1011:
-    			ret = "adb";
-    			break;
-    		case 1013:
-    			ret = "media";
-    			break;
-    		case 1014:
-    			ret = "dhcp";
-    			break;
-    			
-    	}
-    	return ret;
+    String getName(int uid) {
+        String ret = "";
+        switch (uid) {
+            case 0:
+                ret = "root";
+                break;
+            case 1000:
+                ret = "system";
+                break;
+            case 1001:
+                ret = "radio";
+                break;
+            case 1002:
+                ret = "bluetooth";
+                break;
+            case 1003:
+                ret = "graphics";
+                break;
+            case 1004:
+                ret = "input";
+                break;
+            case 1005:
+                ret = "audio";
+                break;
+            case 1006:
+                ret = "camera";
+                break;
+            case 1007:
+                ret = "log";
+                break;
+            case 1008:
+                ret = "compass";
+                break;
+            case 1009:
+                ret = "mount";
+                break;
+            case 1010:
+                ret = "wifi";
+                break;
+            case 1011:
+                ret = "adb";
+                break;
+            case 1013:
+                ret = "media";
+                break;
+            case 1014:
+                ret = "dhcp";
+                break;
+
+        }
+        return ret;
     }
 
 }
diff --git a/src/com/asksven/android/common/networkutils/DataNetwork.java b/src/com/asksven/android/common/networkutils/DataNetwork.java
index 21094ee..a55e08f 100644
--- a/src/com/asksven/android/common/networkutils/DataNetwork.java
+++ b/src/com/asksven/android/common/networkutils/DataNetwork.java
@@ -21,43 +21,29 @@
 
 /**
  * Helper class for data connectivity
- * @author sven
  *
+ * @author sven
  */
-public class DataNetwork
-{
-	public static boolean hasDataConnection(Context ctx)
-	{
-		boolean ret = true;
-		ConnectivityManager myConnectivity = 
-				(ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
-		
-		// if no network connection is available buffer the update
-		// @see android.net.NetworkInfo
-		if ( (myConnectivity == null)
-				|| (myConnectivity.getActiveNetworkInfo() == null)
-				|| (!myConnectivity.getActiveNetworkInfo().isAvailable()) )
-		{
-			
-			ret = false;
-		}
-		
-		return ret;
-	}
-	
-	public static boolean hasWifiConnection(Context ctx)
-	{
-		boolean ret = false;
-		ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
-	    if( cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnectedOrConnecting() )
-	    {
-	        ret = true; 
-	    }
-	    else
-	    {
-	    	ret = false;
-	    }
-	    
-	    return ret;
-	}
+public class DataNetwork {
+    public static boolean hasDataConnection(Context ctx) {
+        boolean ret = true;
+        ConnectivityManager myConnectivity =
+                (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        // if no network connection is available buffer the update
+        // @see android.net.NetworkInfo
+        if ((myConnectivity == null)
+                || (myConnectivity.getActiveNetworkInfo() == null)
+                || (!myConnectivity.getActiveNetworkInfo().isAvailable())) {
+
+            ret = false;
+        }
+
+        return ret;
+    }
+
+    public static boolean hasWifiConnection(Context ctx) {
+        ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
+        return cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnectedOrConnecting();
+    }
 }
diff --git a/src/com/asksven/android/common/privateapiproxies/Alarm.java b/src/com/asksven/android/common/privateapiproxies/Alarm.java
index 7a7ac42..56743ab 100644
--- a/src/com/asksven/android/common/privateapiproxies/Alarm.java
+++ b/src/com/asksven/android/common/privateapiproxies/Alarm.java
@@ -16,383 +16,349 @@
 
 package com.asksven.android.common.privateapiproxies;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 
-import com.asksven.android.common.privateapiproxies.StatElement;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * @author sven
- * Value holder for alarms
+ *         Value holder for alarms
  */
-public class Alarm extends StatElement implements Comparable<Alarm>, Serializable
-{
-	/** 
-	 * the tag for logging
-	 */
-	private static transient final String TAG = "Alarm";
-	
-	/** The name of the app responsible for the alarm */
-	String m_strPackageName;
-	
-	/** The number od wakeups */
-	long m_nWakeups;
-	
-	/** The total count */
-	long m_nTotalCount;
-	
-	
-	/** The details */
-	ArrayList<AlarmItem> m_items;
-	
-
-
-	/**
-	 * The default cctor
-	 * @param strName
-	 */
-	public Alarm(String strName)
-	{
-		m_strPackageName = strName;
-		m_items = new ArrayList<AlarmItem>();
-	}
-	
-	/**
-	 * Store the number of wakeups 
-	 * @param nCount
-	 */
-	public void setWakeups(long nCount)
-	{
-		m_nWakeups = nCount;
-	}
-	
-
-	/**
-	 * Set the total wakeup count for the sum of all alarms
-	 * @param nCount
-	 */
-	public void setTotalCount(long nCount)
-	{
-		m_nTotalCount = nCount;
-	}
-	
-	/**
-	 * Return the max of all alarms (wakeups) 
-	 */
-	public double getMaxValue()
-	{
-		return m_nTotalCount;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.asksven.android.common.privateapiproxies.StatElement#getName()
-	 */
-	public String getName()
-	{
-		return m_strPackageName;
-	}
-	
-	/**
-	 * Returns the number of wakeups
-	 * @return
-	 */
-	public long getWakeups()
-	{
-		return m_nWakeups;
-	}
-	
-	/**
-	 * @see getWakeups
-	 * @return
-	 */
-	long getCount()
-	{
-		return getWakeups();
-	}
-	
-	/** 
-	 * Not supported for alarms
-	 * @return 0
-	 */
-	long getDuration()
-	{
-		return 0;
-	}
-	
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = getCount();
-		return retVal;
-	}
-	
-	/**
-	 * returns a string representation of the data
-	 */
-	public String getData()
-	{
-		String strRet = "";
-		strRet = "Wakeups: " + getCount();
-		
-		return strRet;
-	}
-
-	/**
-	 * returns a string representation of the detailed data (including children)  
-	 */
-	public String getDetailedData()
-	{
-		String strRet = "";
-		strRet = "Wakeups: " + getCount() + "\n";
-		
-		for (int i=0; i < m_items.size(); i++)
-		{
-			strRet += "  " + m_items.get(i).getData() + "\n";
-		}
-		
-		return strRet;
-	}
-
-	/** 
-	 * returns the representation of the data for file dump
-	 */	
-	public String getDumpData(Context context)
-	{
-		return this.getName() + " (" + this.getFqn(context) + "): " + this.getDetailedData();
-	}
-
-	
-	/**
-	 * Adds an item
-	 * @param nCount
-	 * @param strIntent
-	 */
-	public void addItem(long nCount, String strIntent)
-	{
-		m_items.add(new AlarmItem(nCount, strIntent));
-	}
-	
-	/**
-	 * Retrieve the list of items
-	 * @return
-	 */
-	public ArrayList<AlarmItem> getItems()
-	{
-		return m_items;
-	}
-	
-	/**
-	 * Substracts the values from a previous object
-	 * found in myList from the current Process
-	 * in order to obtain an object containing only the data since a referenc
-	 * @param myList
-	 */
-	public void substractFromRef(List<StatElement> myList )
-	{
-		if (myList != null)
-		{
-			for (int i = 0; i < myList.size(); i++)
-			{
-				try
-				{
-					Alarm myRef = (Alarm) myList.get(i);
-					if (this.getName().equals(myRef.getName()))
-					{
-						// process main values
-						Log.i(TAG, "Substracting " + myRef.toString() + " from " + this.toString());
-						this.m_nWakeups		-= myRef.getCount();
-						this.m_nTotalCount  -= myRef.getMaxValue();
-						Log.i(TAG, "Result: " + this.toString());
-						
-						// and process items
-						for (int j=0; j < this.m_items.size(); j++)
-						{
-							AlarmItem myItem = this.m_items.get(j);
-							myItem.substractFromRef(myRef.getItems());
-						}
-
-						if (this.getCount() < 0)
-						{
-							Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
-						}
-						if (this.getItems().size() < myRef.getItems().size())
-						{
-							Log.e(TAG, "substractFromRef error processing alarm items: ref can not have less items");
-						}
-							
-					}
-				}
-				catch (ClassCastException e)
-				{
-					// just log as it is no error not to change the process
-					// being substracted from to do nothing
-					Log.e(TAG, "substractFromRef was called with a wrong list type");
-				}
-				
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() 
-	{
-		return getName() + " ["
-				+ getData()
-				+ "]";
-	}
-
-
-	/**
-	 * Value holder for alarm items
-	 * @author sven
-	 *
-	 */
-	public class AlarmItem implements Serializable
-	{
-		long m_nNumber;
-		String m_strIntent;
-		
-		/**
-		 * Default cctor
-		 * @param nCount
-		 * @param strIntent
-		 */
-		public AlarmItem(long nCount, String strIntent)
-		{
-			m_nNumber 	= nCount;
-			m_strIntent = strIntent;
-		}
-		
-		/**
-		 * Returns the intent name
-		 * @return
-		 */
-		public String getIntent()
-		{
-			return m_strIntent;
-		}
-		
-		/**
-		 * Returns the count
-		 * @return
-		 */
-		public long getCount()
-		{
-			return m_nNumber;
-		}
-		/**
-		 * Returns the data as a string
-		 * @return
-		 */
-		public String getData()
-		{
-			return "Alarms: " + m_nNumber + ", Intent: " + m_strIntent;
-		}
-		/**
-		 * Substracts the values from a previous object
-		 * found in myList from the current Process
-		 * in order to obtain an object containing only the data since a referenc
-		 * @param myList
-		 */
-		public void substractFromRef(List<AlarmItem> myList )
-		{
-			if (myList != null)
-			{
-				for (int i = 0; i < myList.size(); i++)
-				{
-					try
-					{
-						AlarmItem myRef = (AlarmItem) myList.get(i);
-						if (this.getIntent().equals(myRef.getIntent()))
-						{
-							// process main values
-							Log.i(TAG, "Substracting " + myRef.toString() + " from " + this.toString());
-							this.m_nNumber		-= myRef.getCount();
-							Log.i(TAG, "Result: " + this.toString());
-						}
-					}
-					catch (ClassCastException e)
-					{
-						// just log as it is no error not to change the process
-						// being substracted from to do nothing
-						Log.e(TAG, "AlarmItem.substractFromRef was called with a wrong list type");
-					}
-				}
-			}
-		}
-	}
-	
-	public Drawable getIcon(Context ctx)
-	{
-		if (m_icon == null)
-		{
-			// retrieve and store the icon for that package
-			String myPackage = m_strPackageName;
-			if (!myPackage.equals(""))
-			{
-				PackageManager manager = ctx.getPackageManager();
-				try
-				{
-					m_icon = manager.getApplicationIcon(myPackage);
-				}
-				catch (Exception e)
-				{
-					// nop: no icon found
-					m_icon = null;
-				}
-				
-			}
-		}
-		return m_icon;
-	}
-	
-	public String getPackageName()
-	{
-		return m_strPackageName;
-	}
-
-
-	
-	 /**
+public class Alarm extends StatElement implements Comparable<Alarm>, Serializable {
+    /**
+     * the tag for logging
+     */
+    private static transient final String TAG = "Alarm";
+
+    /**
+     * The name of the app responsible for the alarm
+     */
+    String m_strPackageName;
+
+    /**
+     * The number od wakeups
+     */
+    long m_nWakeups;
+
+    /**
+     * The total count
+     */
+    long m_nTotalCount;
+
+
+    /**
+     * The details
+     */
+    ArrayList<AlarmItem> m_items;
+
+
+    /**
+     * The default cctor
+     *
+     * @param strName
+     */
+    public Alarm(String strName) {
+        m_strPackageName = strName;
+        m_items = new ArrayList<AlarmItem>();
+    }
+
+    /**
+     * Store the number of wakeups
+     *
+     * @param nCount
+     */
+    public void setWakeups(long nCount) {
+        m_nWakeups = nCount;
+    }
+
+
+    /**
+     * Set the total wakeup count for the sum of all alarms
+     *
+     * @param nCount
+     */
+    public void setTotalCount(long nCount) {
+        m_nTotalCount = nCount;
+    }
+
+    /**
+     * Return the max of all alarms (wakeups)
+     */
+    public double getMaxValue() {
+        return m_nTotalCount;
+    }
+
+    /* (non-Javadoc)
+     * @see com.asksven.android.common.privateapiproxies.StatElement#getName()
+     */
+    public String getName() {
+        return m_strPackageName;
+    }
+
+    /**
+     * Returns the number of wakeups
+     *
+     * @return
+     */
+    public long getWakeups() {
+        return m_nWakeups;
+    }
+
+    /**
+     * @return
+     * @see getWakeups
+     */
+    long getCount() {
+        return getWakeups();
+    }
+
+    /**
+     * Not supported for alarms
+     *
+     * @return 0
+     */
+    long getDuration() {
+        return 0;
+    }
+
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = getCount();
+        return retVal;
+    }
+
+    /**
+     * returns a string representation of the data
+     */
+    public String getData() {
+        String strRet = "";
+        strRet = "Wakeups: " + getCount();
+
+        return strRet;
+    }
+
+    /**
+     * returns a string representation of the detailed data (including children)
+     */
+    public String getDetailedData() {
+        String strRet = "";
+        strRet = "Wakeups: " + getCount() + "\n";
+
+        for (AlarmItem m_item : m_items) {
+            strRet += "  " + m_item.getData() + "\n";
+        }
+
+        return strRet;
+    }
+
+    /**
+     * returns the representation of the data for file dump
+     */
+    public String getDumpData(Context context) {
+        return this.getName() + " (" + this.getFqn(context) + "): " + this.getDetailedData();
+    }
+
+
+    /**
+     * Adds an item
+     *
+     * @param nCount
+     * @param strIntent
+     */
+    public void addItem(long nCount, String strIntent) {
+        m_items.add(new AlarmItem(nCount, strIntent));
+    }
+
+    /**
+     * Retrieve the list of items
+     *
+     * @return list of items
+     */
+    public ArrayList<AlarmItem> getItems() {
+        return m_items;
+    }
+
+    /**
+     * Substracts the values from a previous object
+     * found in myList from the current Process
+     * in order to obtain an object containing only the data since a referenc
+     *
+     * @param myList
+     */
+    public void substractFromRef(List<StatElement> myList) {
+        if (myList != null) {
+            for (StatElement aMyList : myList) {
+                try {
+                    Alarm myRef = (Alarm) aMyList;
+                    if (this.getName().equals(myRef.getName())) {
+                        // process main values
+                        Log.i(TAG, "Substracting " + myRef.toString() + " from " + this.toString());
+                        this.m_nWakeups -= myRef.getCount();
+                        this.m_nTotalCount -= myRef.getMaxValue();
+                        Log.i(TAG, "Result: " + this.toString());
+
+                        // and process items
+                        for (AlarmItem myItem : this.m_items) {
+                            myItem.substractFromRef(myRef.getItems());
+                        }
+
+                        if (this.getCount() < 0) {
+                            Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
+                        }
+                        if (this.getItems().size() < myRef.getItems().size()) {
+                            Log.e(TAG, "substractFromRef error processing alarm items: ref can not have less items");
+                        }
+
+                    }
+                } catch (ClassCastException e) {
+                    // just log as it is no error not to change the process
+                    // being substracted from to do nothing
+                    Log.e(TAG, "substractFromRef was called with a wrong list type");
+                }
+
+            }
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return getName() + " ["
+                + getData()
+                + "]";
+    }
+
+
+    /**
+     * Value holder for alarm items
+     *
+     * @author sven
+     */
+    public class AlarmItem implements Serializable {
+        long m_nNumber;
+        String m_strIntent;
+
+        /**
+         * Default cctor
+         *
+         * @param nCount
+         * @param strIntent
+         */
+        public AlarmItem(long nCount, String strIntent) {
+            m_nNumber = nCount;
+            m_strIntent = strIntent;
+        }
+
+        /**
+         * Returns the intent name
+         *
+         * @return
+         */
+        public String getIntent() {
+            return m_strIntent;
+        }
+
+        /**
+         * Returns the count
+         *
+         * @return
+         */
+        public long getCount() {
+            return m_nNumber;
+        }
+
+        /**
+         * Returns the data as a string
+         *
+         * @return
+         */
+        public String getData() {
+            return "Alarms: " + m_nNumber + ", Intent: " + m_strIntent;
+        }
+
+        /**
+         * Substracts the values from a previous object
+         * found in myList from the current Process
+         * in order to obtain an object containing only the data since a referenc
+         *
+         * @param myList
+         */
+        public void substractFromRef(List<AlarmItem> myList) {
+            if (myList != null) {
+                for (AlarmItem aMyList : myList) {
+                    try {
+                        AlarmItem myRef = (AlarmItem) aMyList;
+                        if (this.getIntent().equals(myRef.getIntent())) {
+                            // process main values
+                            Log.i(TAG, "Substracting " + myRef.toString() + " from " + this.toString());
+                            this.m_nNumber -= myRef.getCount();
+                            Log.i(TAG, "Result: " + this.toString());
+                        }
+                    } catch (ClassCastException e) {
+                        // just log as it is no error not to change the process
+                        // being substracted from to do nothing
+                        Log.e(TAG, "AlarmItem.substractFromRef was called with a wrong list type");
+                    }
+                }
+            }
+        }
+    }
+
+    public Drawable getIcon(Context ctx) {
+        if (m_icon == null) {
+            // retrieve and store the icon for that package
+            String myPackage = m_strPackageName;
+            if (!myPackage.equals("")) {
+                PackageManager manager = ctx.getPackageManager();
+                try {
+                    m_icon = manager.getApplicationIcon(myPackage);
+                } catch (Exception e) {
+                    // nop: no icon found
+                    m_icon = null;
+                }
+
+            }
+        }
+        return m_icon;
+    }
+
+    public String getPackageName() {
+        return m_strPackageName;
+    }
+
+
+    /**
      * Compare a given Wakelock with this object.
-     * If the duration of this object is 
+     * If the duration of this object is
      * greater than the received object,
      * then this object is greater than the other.
      */
-	public int compareTo(Alarm o)
-	{
-		// we want to sort in descending order
-		return ((int)(o.getWakeups() - this.getWakeups()));
-	}
-
-	public static class CountComparator implements Comparator<Alarm>
-	{
-		public int compare(Alarm a, Alarm b)
-		{
-			return ((int)(b.getCount() - a.getCount()));
-		}
-	}
-	
-	public static class TimeComparator implements Comparator<Alarm>
-	{
-		public int compare(Alarm a, Alarm b)
-		{
-			return ((int)(b.getDuration() - a.getDuration()));
-		}
-	}
-	
-	
+    public int compareTo(Alarm o) {
+        // we want to sort in descending order
+        return ((int) (o.getWakeups() - this.getWakeups()));
+    }
+
+    public static class CountComparator implements Comparator<Alarm> {
+        public int compare(Alarm a, Alarm b) {
+            return ((int) (b.getCount() - a.getCount()));
+        }
+    }
+
+    public static class TimeComparator implements Comparator<Alarm> {
+        public int compare(Alarm a, Alarm b) {
+            return ((int) (b.getDuration() - a.getDuration()));
+        }
+    }
+
 }
diff --git a/src/com/asksven/android/common/privateapiproxies/BatteryStatsProxy.java b/src/com/asksven/android/common/privateapiproxies/BatteryStatsProxy.java
index 37e9671..b67e013 100644
--- a/src/com/asksven/android/common/privateapiproxies/BatteryStatsProxy.java
+++ b/src/com/asksven/android/common/privateapiproxies/BatteryStatsProxy.java
@@ -81,7 +81,7 @@ public void invalidate() {
      * Default cctor
      */
     private BatteryStatsProxy(Context context) {        /*
-		 * As BatteryStats is a service we need to get a binding using the IBatteryStats.Stub.getStatistics()
+         * As BatteryStats is a service we need to get a binding using the IBatteryStats.Stub.getStatistics()
 		 * method (using reflection).
 		 * If we would be using a public API the code would look like:
 		 * @see com.android.settings.fuelgauge.PowerUsageSummary.java 
@@ -215,7 +215,7 @@ public boolean initFailed() {
      * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long computeBatteryRealtime(long curTime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -229,15 +229,15 @@ public Long computeBatteryRealtime(long curTime, int iStatsType) throws BatteryI
 
             //Parameters
             Object[] params = new Object[2];
-            params[0] = new Long(curTime);
-            params[1] = new Integer(iStatsType);
+            params[0] = curTime;
+            params[1] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
 
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
@@ -252,7 +252,7 @@ public Long computeBatteryRealtime(long curTime, int iStatsType) throws BatteryI
      * @param curTime the current elapsed realtime in microseconds.
      */
     public Long getBatteryRealtime(long curTime) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -266,7 +266,7 @@ public Long getBatteryRealtime(long curTime) throws BatteryInfoUnavailableExcept
 
             //Parameters
             Object[] params = new Object[1];
-            params[0] = new Long(curTime);
+            params[0] = curTime;
 
 
             ret = (Long) method.invoke(m_Instance, params);
@@ -274,7 +274,7 @@ public Long getBatteryRealtime(long curTime) throws BatteryInfoUnavailableExcept
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
@@ -290,7 +290,7 @@ public Long getBatteryRealtime(long curTime) throws BatteryInfoUnavailableExcept
      * @param iStatsType one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long computeBatteryUptime(long curTime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -304,15 +304,15 @@ public Long computeBatteryUptime(long curTime, int iStatsType) throws BatteryInf
 
             //Parameters
             Object[] params = new Object[2];
-            params[0] = new Long(curTime);
-            params[1] = new Integer(iStatsType);
+            params[0] = curTime;
+            params[1] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
 
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
@@ -328,7 +328,7 @@ public Long computeBatteryUptime(long curTime, int iStatsType) throws BatteryInf
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getScreenOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -342,21 +342,19 @@ public Long getScreenOnTime(long batteryRealtime, int iStatsType) throws Battery
 
             //Parameters
             Object[] params = new Object[2];
-            params[0] = new Long(batteryRealtime);
-            params[1] = new Integer(iStatsType);
+            params[0] = batteryRealtime;
+            params[1] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
 
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
-
-
     }
 
     /**
@@ -386,8 +384,6 @@ public boolean getIsOnBattery() throws BatteryInfoUnavailableException {
         }
 
         return ret;
-
-
     }
 
     /**
@@ -397,7 +393,7 @@ public boolean getIsOnBattery() throws BatteryInfoUnavailableException {
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getPhoneOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -411,21 +407,19 @@ public Long getPhoneOnTime(long batteryRealtime, int iStatsType) throws BatteryI
 
             //Parameters
             Object[] params = new Object[2];
-            params[0] = new Long(batteryRealtime);
-            params[1] = new Integer(iStatsType);
+            params[0] = batteryRealtime;
+            params[1] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
 
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
-
-
     }
 
     /**
@@ -435,7 +429,7 @@ public Long getPhoneOnTime(long batteryRealtime, int iStatsType) throws BatteryI
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getWifiOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -449,8 +443,8 @@ public Long getWifiOnTime(long batteryRealtime, int iStatsType) throws BatteryIn
 
             //Parameters
             Object[] params = new Object[2];
-            params[0] = new Long(batteryRealtime);
-            params[1] = new Integer(iStatsType);
+            params[0] = batteryRealtime;
+            params[1] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
             Log.i("TAG", "getWifiOnTime with params " + params[0] + " and " + params[1] + " returned " + ret);
@@ -458,13 +452,11 @@ public Long getWifiOnTime(long batteryRealtime, int iStatsType) throws BatteryIn
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
-
-
     }
 
     /**
@@ -474,7 +466,7 @@ public Long getWifiOnTime(long batteryRealtime, int iStatsType) throws BatteryIn
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getGlobalWifiRunningTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -488,8 +480,8 @@ public Long getGlobalWifiRunningTime(long batteryRealtime, int iStatsType) throw
 
             //Parameters
             Object[] params = new Object[2];
-            params[0] = new Long(batteryRealtime);
-            params[1] = new Integer(iStatsType);
+            params[0] = batteryRealtime;
+            params[1] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
             Log.i("TAG", "getGlobalWifiRunningTime with params " + params[0] + " and " + params[1] + " returned " + ret);
@@ -497,13 +489,11 @@ public Long getGlobalWifiRunningTime(long batteryRealtime, int iStatsType) throw
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
         return ret;
-
-
     }
 
     /**
@@ -513,7 +503,7 @@ public Long getGlobalWifiRunningTime(long batteryRealtime, int iStatsType) throw
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getWifiRunningTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret = (long) 0;
 
         this.collectUidStats();
         if (m_uidStats != null) {
@@ -538,8 +528,8 @@ public Long getWifiRunningTime(Context context, long batteryRealtime, int iStats
 
                     //Parameters
                     Object[] params = new Object[2];
-                    params[0] = new Long(batteryRealtime);
-                    params[1] = new Integer(iStatsType);
+                    params[0] = batteryRealtime;
+                    params[1] = iStatsType;
 
                     ret += (Long) method.invoke(myUid, params);
 
@@ -552,7 +542,7 @@ public Long getWifiRunningTime(Context context, long batteryRealtime, int iStats
                 throw e;
             } catch (Exception e) {
                 Log.e(TAG, "getWifiRunning threw an Exception: " + e.getMessage());
-                ret = new Long(0);
+                ret = (long) 0;
                 throw new BatteryInfoUnavailableException();
             }
         }
@@ -566,7 +556,7 @@ public Long getWifiRunningTime(Context context, long batteryRealtime, int iStats
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getFullWifiLockTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret = (long) 0;
 
         this.collectUidStats();
         if (m_uidStats != null) {
@@ -591,8 +581,8 @@ public Long getFullWifiLockTime(Context context, long batteryRealtime, int iStat
 
                     //Parameters
                     Object[] params = new Object[2];
-                    params[0] = new Long(batteryRealtime);
-                    params[1] = new Integer(iStatsType);
+                    params[0] = batteryRealtime;
+                    params[1] = iStatsType;
 
                     ret += (Long) method.invoke(myUid, params);
 
@@ -600,7 +590,7 @@ public Long getFullWifiLockTime(Context context, long batteryRealtime, int iStat
             } catch (IllegalArgumentException e) {
                 throw e;
             } catch (Exception e) {
-                ret = new Long(0);
+                ret = (long) 0;
                 throw new BatteryInfoUnavailableException();
             }
         }
@@ -614,7 +604,7 @@ public Long getFullWifiLockTime(Context context, long batteryRealtime, int iStat
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getScanWifiLockTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret = (long) 0;
 
         this.collectUidStats();
         if (m_uidStats != null) {
@@ -639,8 +629,8 @@ public Long getScanWifiLockTime(Context context, long batteryRealtime, int iStat
 
                     //Parameters
                     Object[] params = new Object[2];
-                    params[0] = new Long(batteryRealtime);
-                    params[1] = new Integer(iStatsType);
+                    params[0] = batteryRealtime;
+                    params[1] = iStatsType;
 
                     ret += (Long) method.invoke(myUid, params);
 
@@ -648,7 +638,7 @@ public Long getScanWifiLockTime(Context context, long batteryRealtime, int iStat
             } catch (IllegalArgumentException e) {
                 throw e;
             } catch (Exception e) {
-                ret = new Long(0);
+                ret = (long) 0;
                 throw new BatteryInfoUnavailableException();
             }
         }
@@ -662,7 +652,7 @@ public Long getScanWifiLockTime(Context context, long batteryRealtime, int iStat
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getWifiMulticastTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret = (long) 0;
 
         this.collectUidStats();
         if (m_uidStats != null) {
@@ -687,8 +677,8 @@ public Long getWifiMulticastTime(Context context, long batteryRealtime, int iSta
 
                     //Parameters
                     Object[] params = new Object[2];
-                    params[0] = new Long(batteryRealtime);
-                    params[1] = new Integer(iStatsType);
+                    params[0] = batteryRealtime;
+                    params[1] = iStatsType;
 
                     ret += (Long) method.invoke(myUid, params);
 
@@ -696,7 +686,7 @@ public Long getWifiMulticastTime(Context context, long batteryRealtime, int iSta
             } catch (IllegalArgumentException e) {
                 throw e;
             } catch (Exception e) {
-                ret = new Long(0);
+                ret = (long) 0;
                 throw new BatteryInfoUnavailableException();
             }
         }
@@ -708,10 +698,10 @@ public Long getWifiMulticastTime(Context context, long batteryRealtime, int iSta
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
-     * @params dataType the given data connection type (@see http://www.netmite.com/android/mydroid/donut/frameworks/base/core/java/android/os/BatteryStats.java)
+     * @param dataType        the given data connection type (@see http://www.netmite.com/android/mydroid/donut/frameworks/base/core/java/android/os/BatteryStats.java)
      */
     public Long getPhoneDataConnectionTime(int dataType, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -726,9 +716,9 @@ public Long getPhoneDataConnectionTime(int dataType, long batteryRealtime, int i
 
             //Parameters
             Object[] params = new Object[3];
-            params[0] = new Integer(dataType);
-            params[1] = new Long(batteryRealtime);
-            params[2] = new Integer(iStatsType);
+            params[0] = dataType;
+            params[1] = batteryRealtime;
+            params[2] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
             Log.i("TAG", "getPhoneDataConnectionTime with params " + params[0] + ", " + params[1] + "and " + params[2] + " returned " + ret);
@@ -736,7 +726,7 @@ public Long getPhoneDataConnectionTime(int dataType, long batteryRealtime, int i
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
@@ -750,10 +740,10 @@ public Long getPhoneDataConnectionTime(int dataType, long batteryRealtime, int i
      *
      * @param batteryRealtime the battery realtime in microseconds (@see computeBatteryRealtime).
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
-     * @params signalStrength the given data connection type (@see http://www.netmite.com/android/mydroid/donut/frameworks/base/core/java/android/os/BatteryStats.java)
+     * @param signalStrength  the given data connection type (@see http://www.netmite.com/android/mydroid/donut/frameworks/base/core/java/android/os/BatteryStats.java)
      */
     public Long getPhoneSignalStrengthTime(int signalStrength, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -768,9 +758,9 @@ public Long getPhoneSignalStrengthTime(int signalStrength, long batteryRealtime,
 
             //Parameters
             Object[] params = new Object[3];
-            params[0] = new Integer(signalStrength);
-            params[1] = new Long(batteryRealtime);
-            params[2] = new Integer(iStatsType);
+            params[0] = signalStrength;
+            params[1] = batteryRealtime;
+            params[2] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
             Log.i("TAG", "getPhoneSignalStrengthTime with params " + params[0] + ", " + params[1] + "and " + params[2] + " returned " + ret);
@@ -778,7 +768,7 @@ public Long getPhoneSignalStrengthTime(int signalStrength, long batteryRealtime,
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
@@ -794,7 +784,7 @@ public Long getPhoneSignalStrengthTime(int signalStrength, long batteryRealtime,
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getAudioTurnedOnTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret = (long) 0;
 
         this.collectUidStats();
         if (m_uidStats != null) {
@@ -819,8 +809,8 @@ public Long getAudioTurnedOnTime(Context context, long batteryRealtime, int iSta
 
                     //Parameters
                     Object[] params = new Object[2];
-                    params[0] = new Long(batteryRealtime);
-                    params[1] = new Integer(iStatsType);
+                    params[0] = batteryRealtime;
+                    params[1] = iStatsType;
 
                     ret += (Long) method.invoke(myUid, params);
 
@@ -828,7 +818,7 @@ public Long getAudioTurnedOnTime(Context context, long batteryRealtime, int iSta
             } catch (IllegalArgumentException e) {
                 throw e;
             } catch (Exception e) {
-                ret = new Long(0);
+                ret = (long) 0;
                 throw new BatteryInfoUnavailableException();
             }
         }
@@ -842,7 +832,7 @@ public Long getAudioTurnedOnTime(Context context, long batteryRealtime, int iSta
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getVideoTurnedOnTime(Context context, long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret = (long) 0;
 
         this.collectUidStats();
         if (m_uidStats != null) {
@@ -867,8 +857,8 @@ public Long getVideoTurnedOnTime(Context context, long batteryRealtime, int iSta
 
                     //Parameters
                     Object[] params = new Object[2];
-                    params[0] = new Long(batteryRealtime);
-                    params[1] = new Integer(iStatsType);
+                    params[0] = batteryRealtime;
+                    params[1] = iStatsType;
 
                     ret += (Long) method.invoke(myUid, params);
 
@@ -876,7 +866,7 @@ public Long getVideoTurnedOnTime(Context context, long batteryRealtime, int iSta
             } catch (IllegalArgumentException e) {
                 throw e;
             } catch (Exception e) {
-                ret = new Long(0);
+                ret = (long) 0;
                 throw new BatteryInfoUnavailableException();
             }
         }
@@ -890,7 +880,7 @@ public Long getVideoTurnedOnTime(Context context, long batteryRealtime, int iSta
      * @param iStatsType      one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
      */
     public Long getBluetoothOnTime(long batteryRealtime, int iStatsType) throws BatteryInfoUnavailableException {
-        Long ret = new Long(0);
+        Long ret;
 
         try {
             //Parameters Types
@@ -904,15 +894,15 @@ public Long getBluetoothOnTime(long batteryRealtime, int iStatsType) throws Batt
 
             //Parameters
             Object[] params = new Object[2];
-            params[0] = new Long(batteryRealtime);
-            params[1] = new Integer(iStatsType);
+            params[0] = batteryRealtime;
+            params[1] = iStatsType;
 
             ret = (Long) method.invoke(m_Instance, params);
 
         } catch (IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
-            ret = new Long(0);
+            ret = (long) 0;
             throw new BatteryInfoUnavailableException();
         }
 
@@ -931,8 +921,7 @@ public boolean getIsOnBattery(Context context) throws BatteryInfoUnavailableExce
             @SuppressWarnings("unchecked")
             Method method = m_ClassDefinition.getMethod("getIsOnBattery");
 
-            Boolean oRet = (Boolean) method.invoke(m_Instance);
-            ret = oRet.booleanValue();
+            ret = (Boolean) method.invoke(m_Instance);
 
         } catch (IllegalArgumentException e) {
             throw e;
@@ -955,8 +944,7 @@ public int getDischargeCurrentLevel() throws BatteryInfoUnavailableException {
             @SuppressWarnings("unchecked")
             Method method = m_ClassDefinition.getMethod("getDischargeCurrentLevel");
 
-            Integer oRet = (Integer) method.invoke(m_Instance);
-            ret = oRet.intValue();
+            ret = (Integer) method.invoke(m_Instance);
 
         } catch (IllegalArgumentException e) {
             throw e;
@@ -1084,7 +1072,7 @@ public ArrayList<Wakelock> getWakelockStats(Context context, int iWakeType, int
                         // are the ones that should normally be of interest but
                         // WAKE_TYPE_PARTIAL, WAKE_TYPE_FULL, WAKE_TYPE_WINDOW
                         // are possible
-                        paramsGetWakeTime[0] = Integer.valueOf(iWakeType);
+                        paramsGetWakeTime[0] = iWakeType;
 
                         // BatteryStats.Timer
                         Object wakeTimer = methodGetWakeTime.invoke(wakelock, paramsGetWakeTime);
@@ -1102,8 +1090,8 @@ public ArrayList<Wakelock> getWakelockStats(Context context, int iWakeType, int
 
                             //Parameters
                             Object[] paramsGetTotalTimeLocked = new Object[2];
-                            paramsGetTotalTimeLocked[0] = new Long(uSecBatteryTime);
-                            paramsGetTotalTimeLocked[1] = Integer.valueOf(iStatType);
+                            paramsGetTotalTimeLocked[0] = uSecBatteryTime;
+                            paramsGetTotalTimeLocked[1] = iStatType;
 
                             Long wake = (Long) methodGetTotalTimeLocked.invoke(wakeTimer, paramsGetTotalTimeLocked);
 //							Log.d(TAG, "Wakelocks inner: Process = " + wakelockEntry.getKey() + " wakelock [s] " + wake);
@@ -1118,7 +1106,7 @@ public ArrayList<Wakelock> getWakelockStats(Context context, int iWakeType, int
 
                             //Parameters
                             Object[] paramsGetCountLocked = new Object[1];
-                            paramsGetCountLocked[0] = new Integer(iStatType);
+                            paramsGetCountLocked[0] = iStatType;
 
                             Integer count = (Integer) methodGetCountLocked.invoke(wakeTimer, paramsGetCountLocked);
 //							Log.d(TAG, "Wakelocks inner: Process = " + wakelockEntry.getKey() + " count " + count);
@@ -1260,8 +1248,8 @@ public ArrayList<KernelWakelock> getKernelWakelockStats(Context context, int iSt
 
                 //Parameters
                 Object[] paramGetTotalTimeLocked = new Object[2];
-                paramGetTotalTimeLocked[0] = new Long(uSecBatteryTime);
-                paramGetTotalTimeLocked[1] = new Integer(iStatType);
+                paramGetTotalTimeLocked[0] = uSecBatteryTime;
+                paramGetTotalTimeLocked[1] = iStatType;
 
 
                 Method methodGetTotalTimeLocked = classSamplingTimer
@@ -1274,7 +1262,7 @@ public ArrayList<KernelWakelock> getKernelWakelockStats(Context context, int iSt
 
                 //Parameters
                 Object[] paramGetCountLocked = new Object[1];
-                paramGetCountLocked[0] = new Integer(iStatType);
+                paramGetCountLocked[0] = iStatType;
 
                 Method methodGetCountLocked = classSamplingTimer
                         .getMethod("getCountLocked", paramTypesGetCountLocked);
@@ -1367,7 +1355,7 @@ public ArrayList<Process> getProcessStats(Context context, int iStatType) throws
 
                             //Parameters
                             Object[] paramsGetXxxTime = new Object[1];
-                            paramsGetXxxTime[0] = new Integer(iStatType);
+                            paramsGetXxxTime[0] = iStatType;
 
                             Long userTime = (Long) methodGetUserTime.invoke(ps, paramsGetXxxTime);
                             Long systemTime = (Long) methodGetSystemTime.invoke(ps, paramsGetXxxTime);
@@ -1444,7 +1432,7 @@ public ArrayList<NetworkUsage> getNetworkUsageStats(Context context, int iStatTy
 
                     //Parameters
                     Object[] paramGetTcpBytesXxx = new Object[1];
-                    paramGetTcpBytesXxx[0] = new Integer(iStatType);
+                    paramGetTcpBytesXxx[0] = iStatType;
 
                     Long tcpBytesReceived = (Long) methodGetTcpBytesReceived.invoke(myUid, paramGetTcpBytesXxx);
                     Long tcpBytesSent = (Long) methodGetTcpBytesSent.invoke(myUid, paramGetTcpBytesXxx);
@@ -1473,7 +1461,6 @@ public ArrayList<NetworkUsage> getNetworkUsageStats(Context context, int iStatTy
      *
      * @param iStatsType a type of stat @see com.asksven.android.common.privateapiproxies.BatteryStatsTypes
      * @return a List of NetworkUsage s
-     * @throws Exception
      */
     public ArrayList<NetworkUsage> getKernelNetworkStats(int iStatsType) {
 
@@ -1529,13 +1516,13 @@ public ArrayList<HistoryItem> getHistory(Context context) throws Exception {
             // while (stats.getNextHistoryLocked(rec)) {
 
             // read the time of query for history
-            Long statTimeRef = Long.valueOf(this.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000,
-                    BatteryStatsTypes.STATS_SINCE_CHARGED));
+            Long statTimeRef;
+            this.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, BatteryStatsTypes.STATS_SINCE_CHARGED);
             statTimeRef = System.currentTimeMillis();
 
             Log.d(TAG, "Reference time (" + statTimeRef + ": " + DateUtils.format(DateUtils.DATE_FORMAT_NOW, statTimeRef));
             // statTimeLast stores the timestamp of the last sample
-            Long statTimeLast = Long.valueOf(0);
+            Long statTimeLast = (long) 0;
 
             if (this.startIteratingHistoryLocked()) {
                 params[0] = myHistoryItem;
@@ -1622,15 +1609,14 @@ public ArrayList<HistoryItem> getHistory(Context context) throws Exception {
                 Log.d(TAG, "Last sample (" + statTimeLast + ")" + DateUtils.format(DateUtils.DATE_FORMAT_NOW, statTimeLast));
 
                 Log.d(TAG, "Correcting all HistoryItem times by an offset of (" + offset + ")" + DateUtils.formatDuration(offset * 1000));
-                for (int i = 0; i < myStats.size(); i++) {
-                    myStats.get(i).setOffset(offset);
+                for (HistoryItem myStat : myStats) {
+                    myStat.setOffset(offset);
                 }
             }
         } catch (Exception e) {
             Log.e("TAG", "An exception occured in getHistory(). Message: " + e.getMessage() + ", cause: " + e.getCause().getMessage());
             throw e;
         }
-
         return myStats;
     }
 
diff --git a/src/com/asksven/android/common/privateapiproxies/BatteryStatsTypes.java b/src/com/asksven/android/common/privateapiproxies/BatteryStatsTypes.java
index 0f6853d..34f01be 100644
--- a/src/com/asksven/android/common/privateapiproxies/BatteryStatsTypes.java
+++ b/src/com/asksven/android/common/privateapiproxies/BatteryStatsTypes.java
@@ -16,18 +16,15 @@
 package com.asksven.android.common.privateapiproxies;
 
 
-
-
 /**
  * This class holds the required constants from BatteryStats
  * Copyright (C) 2008 The Android Open Source Project applies
- * @see android.os.BatteryStats
- * @author sven
  *
+ * @author sven
+ * @see android.os.BatteryStats
  */
-public class BatteryStatsTypes
-{
-	/**
+public class BatteryStatsTypes {
+    /**
      * A constant indicating a partial wake lock timer.
      */
     public static final int WAKE_TYPE_PARTIAL = 0;
@@ -41,12 +38,12 @@ public class BatteryStatsTypes
      * A constant indicating a window wake lock timer.
      */
     public static final int WAKE_TYPE_WINDOW = 2;
-    
+
     /**
      * Constants for data connection type
      */
     public static final int DATA_CONNECTION_NONE = 0;
-    
+
     /**
      * Constants for signal strength
      */
@@ -55,30 +52,28 @@ public class BatteryStatsTypes
     public static final int SIGNAL_STRENGTH_MODERATE = 2;
     public static final int SIGNAL_STRENGTH_GOOD = 3;
     public static final int SIGNAL_STRENGTH_GREAT = 4;
-    
+
     /**
      * Enum of valid wakelock types
      */
-    public static final boolean assertValidWakeType(int iWakeType)
-    {
-    	boolean ret = false;
-    	switch (iWakeType)
-    	{
-    		case WAKE_TYPE_PARTIAL:
-    			ret = true;
-    			break;
-    		case WAKE_TYPE_FULL:
-    			ret = true;
-    			break;
-    		case WAKE_TYPE_WINDOW:
-    			ret = true;
-    			break;
-    		default: 
-    			ret = false;
-    			break;
-    			
-    	}
-    	return ret;
+    public static boolean assertValidWakeType(int iWakeType) {
+        boolean ret = false;
+        switch (iWakeType) {
+            case WAKE_TYPE_PARTIAL:
+                ret = true;
+                break;
+            case WAKE_TYPE_FULL:
+                ret = true;
+                break;
+            case WAKE_TYPE_WINDOW:
+                ret = true;
+                break;
+            default:
+                ret = false;
+                break;
+
+        }
+        return ret;
     }
 
     /**
@@ -100,58 +95,54 @@ public static final boolean assertValidWakeType(int iWakeType)
      * Include only the run since the last time the device was unplugged in the stats.
      */
     public static final int STATS_SINCE_UNPLUGGED = 3;
-    
+
     /**
      * Enum of valid stat types
      */
-    public static final boolean assertValidStatType(int iStatType)
-    {
-    	boolean ret = false;
-    	switch (iStatType)
-    	{
-    		case STATS_SINCE_CHARGED:
-    			ret = true;
-    			break;
-    		case STATS_LAST:
-    			ret = true;
-    			break;
-    		case STATS_CURRENT:
-    			ret = true;
-    			break;
-    		case STATS_SINCE_UNPLUGGED:
-    			ret = true;
-    			break;
-
-    		default: 
-    			ret = false;
-    			break;
-    			
-    	}
-    	return ret;
+    public static boolean assertValidStatType(int iStatType) {
+        boolean ret = false;
+        switch (iStatType) {
+            case STATS_SINCE_CHARGED:
+                ret = true;
+                break;
+            case STATS_LAST:
+                ret = true;
+                break;
+            case STATS_CURRENT:
+                ret = true;
+                break;
+            case STATS_SINCE_UNPLUGGED:
+                ret = true;
+                break;
+
+            default:
+                ret = false;
+                break;
+
+        }
+        return ret;
     }
-    
+
     /**
      * Enum of valid stat types
      */
-    public static final boolean assertValidWakelockPctRef(int iPctType)
-    {
-    	boolean ret = false;
-    	switch (iPctType)
-    	{
-    		case 0: 	// % of battery time
-    			ret = true;
-    			break;
-    		case 1: 	// % of awake time
-    			ret = true;
-    			break;
-    		case 2:		// % of time awake - time with screen on
-    			ret = true;
-    			break;
-    		default: 
-    			ret = false;
-    			break;
-    			
-    	}
-    	return ret;
+    public static boolean assertValidWakelockPctRef(int iPctType) {
+        boolean ret = false;
+        switch (iPctType) {
+            case 0:     // % of battery time
+                ret = true;
+                break;
+            case 1:     // % of awake time
+                ret = true;
+                break;
+            case 2:        // % of time awake - time with screen on
+                ret = true;
+                break;
+            default:
+                ret = false;
+                break;
+
+        }
+        return ret;
     }
 }
diff --git a/src/com/asksven/android/common/privateapiproxies/HistoryItem.java b/src/com/asksven/android/common/privateapiproxies/HistoryItem.java
index 1633e10..2af3e16 100644
--- a/src/com/asksven/android/common/privateapiproxies/HistoryItem.java
+++ b/src/com/asksven/android/common/privateapiproxies/HistoryItem.java
@@ -15,21 +15,19 @@
  */
 package com.asksven.android.common.privateapiproxies;
 
-import java.io.Serializable;
-
 import android.os.Parcel;
 import android.os.Parcelable;
-
 import com.asksven.android.common.utils.DateUtils;
 
+import java.io.Serializable;
+
 /**
  * Value holder for BatteryStats$HistoryItem
- * @author sven
  *
+ * @author sven
  */
-public class HistoryItem implements Serializable, Parcelable
-{
-	static final long serialVersionUID = 1L;
+public class HistoryItem implements Serializable, Parcelable {
+    static final long serialVersionUID = 1L;
     static final byte CMD_UPDATE = 0;
     static final byte CMD_START = 1;
     static final byte CMD_OVERFLOW = 2;
@@ -45,27 +43,27 @@ public class HistoryItem implements Serializable, Parcelable
     // Constants from DATA_CONNECTION_*
     static final int STATE_DATA_CONNECTION_MASK = 0x000f000;
     static final int STATE_DATA_CONNECTION_SHIFT = 12;
-    
-    static final int STATE_BATTERY_PLUGGED_FLAG = 1<<30;
-    static final int STATE_SCREEN_ON_FLAG = 1<<29;
-    static final int STATE_GPS_ON_FLAG = 1<<28;
-    static final int STATE_PHONE_IN_CALL_FLAG = 1<<27;
-    static final int STATE_PHONE_SCANNING_FLAG = 1<<26;
-    static final int STATE_WIFI_ON_FLAG = 1<<25;
-    static final int STATE_WIFI_RUNNING_FLAG = 1<<24;
-    static final int STATE_WIFI_FULL_LOCK_FLAG = 1<<23;
-    static final int STATE_WIFI_SCAN_LOCK_FLAG = 1<<22;
-    static final int STATE_WIFI_MULTICAST_ON_FLAG = 1<<21;
-    static final int STATE_BLUETOOTH_ON_FLAG = 1<<20;
-    static final int STATE_AUDIO_ON_FLAG = 1<<19;
-    static final int STATE_VIDEO_ON_FLAG = 1<<18;
-    static final int STATE_WAKE_LOCK_FLAG = 1<<17;
-    static final int STATE_SENSOR_ON_FLAG = 1<<16;
-    
+
+    static final int STATE_BATTERY_PLUGGED_FLAG = 1 << 30;
+    static final int STATE_SCREEN_ON_FLAG = 1 << 29;
+    static final int STATE_GPS_ON_FLAG = 1 << 28;
+    static final int STATE_PHONE_IN_CALL_FLAG = 1 << 27;
+    static final int STATE_PHONE_SCANNING_FLAG = 1 << 26;
+    static final int STATE_WIFI_ON_FLAG = 1 << 25;
+    static final int STATE_WIFI_RUNNING_FLAG = 1 << 24;
+    static final int STATE_WIFI_FULL_LOCK_FLAG = 1 << 23;
+    static final int STATE_WIFI_SCAN_LOCK_FLAG = 1 << 22;
+    static final int STATE_WIFI_MULTICAST_ON_FLAG = 1 << 21;
+    static final int STATE_BLUETOOTH_ON_FLAG = 1 << 20;
+    static final int STATE_AUDIO_ON_FLAG = 1 << 19;
+    static final int STATE_VIDEO_ON_FLAG = 1 << 18;
+    static final int STATE_WAKE_LOCK_FLAG = 1 << 17;
+    static final int STATE_SENSOR_ON_FLAG = 1 << 16;
+
     static final int MOST_INTERESTING_STATES =
-        STATE_BATTERY_PLUGGED_FLAG | STATE_SCREEN_ON_FLAG
-        | STATE_GPS_ON_FLAG | STATE_PHONE_IN_CALL_FLAG;
-    
+            STATE_BATTERY_PLUGGED_FLAG | STATE_SCREEN_ON_FLAG
+                    | STATE_GPS_ON_FLAG | STATE_PHONE_IN_CALL_FLAG;
+
     protected Long m_time;
     protected Long m_offset;
     protected Byte m_cmd;
@@ -76,360 +74,308 @@ public class HistoryItem implements Serializable, Parcelable
     protected String m_batteryTemperatureValue;
     protected String m_batteryVoltageValue;
     protected Integer m_statesValue;
-    
+
     public HistoryItem(Long time, Byte cmd, Byte batteryLevel, Byte batteryStatusValue,
-    		Byte batteryHealthValue, Byte batteryPlugTypeValue,
-    		String batteryTemperatureValue,	String batteryVoltageValue,
-    		Integer	statesValue)
-    {
-    	m_time						= time;
-    	m_offset					= Long.valueOf(0);
-    	m_cmd 						= cmd;
-    	m_batteryLevel 				= batteryLevel;
-    	m_batteryStatusValue 		= batteryStatusValue;
-		m_batteryHealthValue 		= batteryHealthValue;
-		m_batteryPlugTypeValue 		= batteryPlugTypeValue;
-		m_batteryTemperatureValue 	= batteryTemperatureValue;
-		m_batteryVoltageValue 		= batteryVoltageValue;
-		m_statesValue 				= statesValue;
-    }
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString()
-	{
-		String strTime = DateUtils.format("HH:mm:ss", m_time);
-		
-		return "HistoryItem [m_time=" + strTime + ", m_cmd=" + m_cmd
-				+ ", m_batteryLevel=" + m_batteryLevel
-				+ ", m_batteryStatusValue=" + m_batteryStatusValue
-				+ ", m_batteryHealthValue=" + m_batteryHealthValue
-				+ ", m_batteryPlugTypeValue=" + m_batteryPlugTypeValue
-				+ ", m_statesValue=" + m_statesValue + "]";
-	}
-
-	/**
-	 * @return the m_cmd
-	 */
-	public Byte getCmd()
-	{
-		return m_cmd;
-	}
-	
-	/**
-	 * Returns the raw time of the HistoryItem as tring
-	 * @return the RAW time as sting
-	 */
-	public String getTime()
-	{
-		return DateUtils.format("HH:mm:ss", m_time);
-		
-	}
-	
-	/**
-	 * returns the "real" time of the HistoryItem by applying the offset
-	 * calculated as the difference of the most recent
-	 * sample from the stats and the current time at the point of reading
-	 * the stats. This norms the last sample to the time the data is queried 
-	 * @return the normalized time
-	 */
-	public String getNormalizedTime()
-	{
-		return DateUtils.format("HH:mm:ss S", m_time + m_offset);
-		
-	}
-
-	public Long getNormalizedTimeLong()
-	{
-		return m_time + m_offset;
-		
-	}
-	/**
-	 * @return the m_batteryLevel
-	 */
-	public String getBatteryLevel()
-	{
-		return String.valueOf(m_batteryLevel);
-	}
-
-	/**
-	 * @return the m_batteryLevel
-	 */
-	public int getBatteryLevelInt()
-	{
-		return m_batteryLevel;
-	}
-
-	/**
-	 * @return the m_statesValue
-	 */
-	public Integer getStatesValue()
-	{
-		return m_statesValue;
-	}
-
-
-	/**
-	 * @return the m_bCharging as "0" or "1"
-	 */
-	public String getCharging()
-	{
-		return getBooleanAsString(isCharging());
-	}
-
-	/**
-	 * @return the m_bCharging as "0" or "1"
-	 */
-	public int getChargingInt()
-	{
-		return getBooleanAsInt(isCharging());
-	}
-
-	/**
-	 * @return the m_bScreenOn as "0" or "1"
-	 */
-	public String getScreenOn()
-	{
-		
-		return getBooleanAsString(isScreenOn());
-	}
-
-	/**
-	 * @return the m_bScreenOn as "0" or "1"
-	 */
-	public int getScreenOnInt()
-	{
-		
-		return getBooleanAsInt(isScreenOn());
-	}
-
-	
-	/**
-	 * @return the m_bWakelock as "0" or "1"
-	 */
-	public String getWakelock()
-	{
-		return getBooleanAsString(isWakeLock());
-	}
-
-	/**
-	 * @return the m_bWakelock as "0" or "1"
-	 */
-	public int getWakelockInt()
-	{
-		return getBooleanAsInt(isWakeLock());
-	}
-
-	/**
-	 * @return the m_bWifiRunning as "0" or "1"
-	 */
-	public String getWifiRunning()
-	{
-		return getBooleanAsString(isWifiRunning());
-	}
-
-	/**
-	 * @return the m_bWifiRunning as "0" or "1"
-	 */
-	public int getWifiRunningInt()
-	{
-		return getBooleanAsInt(isWifiRunning());
-	}
-
-	/**
-	 * @return the m_bGpsOn as "0" or "1"
-	 */
-	public String getGpsOn()
-	{
-		
-		return getBooleanAsString(isGpsOn());
-	}
-
-	/**
-	 * @return the m_bGpsOn as "0" or "1"
-	 */
-	public int getGpsOnInt()
-	{
-		
-		return getBooleanAsInt(isGpsOn());
-	}
-
-	/**
-	 * @return the m_bPhoneInCall as "0" or "1"
-	 */
-	public String getPhoneInCall()
-	{
-		
-		return getBooleanAsString(isPhoneInCall());
-	}
-
-	/**
-	 * @return the m_bPhoneScanning as "0" or "1"
-	 */
-	public String getPhoneScanning()
-	{
-		return getBooleanAsString(isPhoneScanning());
-	}
-
-	/**
-	 * @return the m_bBluetoothOn as "0" or "1"
-	 */
-	public String getBluetoothOn()
-	{
-		return getBooleanAsString(isBluetoothOn());
-	}
-
-	/**
-	 * @return the m_bBluetoothInt as integer
-	 */
-	public int getBluetoothOnInt()
-	{
-
-		return getBooleanAsInt(isBluetoothOn());
-	}
-
-	
-	/**
-	 * @return the m_bCharging as "0" or "1"
-	 */
-	protected String getBooleanAsString(boolean bVal)
-	{
-		if (bVal)
-		{
-			return "1";
-		}
-		else
-		{
-			return "0";
-		}
-	}
-
-	/**
-	 * @return the boolean as 0 or 1
-	 */
-	protected int getBooleanAsInt(boolean bVal)
-	{
-		if (bVal)
-		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	/**
-	 * @return true is phone is charging
-	 */
-	public boolean isCharging()
-	{
-		boolean bCharging = (m_statesValue & STATE_BATTERY_PLUGGED_FLAG) != 0;
-		
-		return bCharging;
-	}
-
-	/**
-	 * @return true if screen is on
-	 */
-	public boolean isScreenOn()
-	{
-		boolean bScreenOn = (m_statesValue & STATE_SCREEN_ON_FLAG) != 0;
-		return bScreenOn;
-	}
-
-	/**
-	 * @return true is GPS is on
-	 */
-	public boolean isGpsOn()
-	{
-		boolean bGpsOn = (m_statesValue & STATE_GPS_ON_FLAG) != 0;
-		return bGpsOn;
-	}
-	
-	/**
-	 * @return true is wifi is running
-	 */
-	public boolean isWifiRunning()
-	{
-		boolean bWifiRunning = (m_statesValue & STATE_WIFI_RUNNING_FLAG) != 0;
-		return bWifiRunning;
-	}
-
-	/**
-	 * @return true is a wakelock is present
-	 */
-	public boolean isWakeLock()
-	{
-		boolean bWakeLock = (m_statesValue & STATE_WAKE_LOCK_FLAG) != 0;
-		return bWakeLock;
-	}
-
-	/**
-	 * @return true  if Phone is in Call
-	 */
-	public boolean isPhoneInCall()
-	{
-		
-		boolean bPhoneInCall = (m_statesValue & STATE_PHONE_IN_CALL_FLAG) != 0;
-
-		return bPhoneInCall;
-	}
-
-	/**
-	 * @return true if Phone is Scanning
-	 */
-	public boolean isPhoneScanning()
-	{
-		boolean bPhoneScanning = (m_statesValue & STATE_PHONE_SCANNING_FLAG) != 0;
-
-		return bPhoneScanning;
-	}
-
-	/**
-	 * @return the true if bluetooth is on
-	 */
-	public boolean isBluetoothOn()
-	{
-		boolean bBluetoothOn = (m_statesValue & STATE_BLUETOOTH_ON_FLAG) != 0;
-
-		return bBluetoothOn;
-	}
-
-	
-	public void setOffset(Long offset)
-	{
-		m_offset = offset;
-	}
-
-	/* (non-Javadoc)
-	 * @see android.os.Parcelable#describeContents()
-	 */
-	@Override
-	public int describeContents()
-	{
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see android.os.Parcelable#writeToParcel(android.os.Parcel, int)
-	 */
-	@Override
-	public void writeToParcel(Parcel dest, int flags)
-	{
-		// TODO Auto-generated method stub
-	    dest.writeLong(m_time);
-	    dest.writeLong(m_offset);
-	    dest.writeByte(m_cmd);
-	    dest.writeByte(m_batteryLevel);
-	    dest.writeByte(m_batteryStatusValue);
-	    dest.writeByte(m_batteryHealthValue);
-	    dest.writeByte(m_batteryPlugTypeValue);
-	    dest.writeString(m_batteryTemperatureValue);
-	    dest.writeString(m_batteryVoltageValue);
-	    dest.writeInt(m_statesValue);
-	}
+                       Byte batteryHealthValue, Byte batteryPlugTypeValue,
+                       String batteryTemperatureValue, String batteryVoltageValue,
+                       Integer statesValue) {
+        m_time = time;
+        m_offset = (long) 0;
+        m_cmd = cmd;
+        m_batteryLevel = batteryLevel;
+        m_batteryStatusValue = batteryStatusValue;
+        m_batteryHealthValue = batteryHealthValue;
+        m_batteryPlugTypeValue = batteryPlugTypeValue;
+        m_batteryTemperatureValue = batteryTemperatureValue;
+        m_batteryVoltageValue = batteryVoltageValue;
+        m_statesValue = statesValue;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        String strTime = DateUtils.format("HH:mm:ss", m_time);
+
+        return "HistoryItem [m_time=" + strTime + ", m_cmd=" + m_cmd
+                + ", m_batteryLevel=" + m_batteryLevel
+                + ", m_batteryStatusValue=" + m_batteryStatusValue
+                + ", m_batteryHealthValue=" + m_batteryHealthValue
+                + ", m_batteryPlugTypeValue=" + m_batteryPlugTypeValue
+                + ", m_statesValue=" + m_statesValue + "]";
+    }
+
+    /**
+     * @return the m_cmd
+     */
+    public Byte getCmd() {
+        return m_cmd;
+    }
+
+    /**
+     * Returns the raw time of the HistoryItem as tring
+     *
+     * @return the RAW time as sting
+     */
+    public String getTime() {
+        return DateUtils.format("HH:mm:ss", m_time);
+
+    }
+
+    /**
+     * returns the "real" time of the HistoryItem by applying the offset
+     * calculated as the difference of the most recent
+     * sample from the stats and the current time at the point of reading
+     * the stats. This norms the last sample to the time the data is queried
+     *
+     * @return the normalized time
+     */
+    public String getNormalizedTime() {
+        return DateUtils.format("HH:mm:ss S", m_time + m_offset);
+
+    }
+
+    public Long getNormalizedTimeLong() {
+        return m_time + m_offset;
+
+    }
+
+    /**
+     * @return the m_batteryLevel
+     */
+    public String getBatteryLevel() {
+        return String.valueOf(m_batteryLevel);
+    }
+
+    /**
+     * @return the m_batteryLevel
+     */
+    public int getBatteryLevelInt() {
+        return m_batteryLevel;
+    }
+
+    /**
+     * @return the m_statesValue
+     */
+    public Integer getStatesValue() {
+        return m_statesValue;
+    }
+
+
+    /**
+     * @return the m_bCharging as "0" or "1"
+     */
+    public String getCharging() {
+        return getBooleanAsString(isCharging());
+    }
+
+    /**
+     * @return the m_bCharging as "0" or "1"
+     */
+    public int getChargingInt() {
+        return getBooleanAsInt(isCharging());
+    }
+
+    /**
+     * @return the m_bScreenOn as "0" or "1"
+     */
+    public String getScreenOn() {
+
+        return getBooleanAsString(isScreenOn());
+    }
+
+    /**
+     * @return the m_bScreenOn as "0" or "1"
+     */
+    public int getScreenOnInt() {
+
+        return getBooleanAsInt(isScreenOn());
+    }
+
+
+    /**
+     * @return the m_bWakelock as "0" or "1"
+     */
+    public String getWakelock() {
+        return getBooleanAsString(isWakeLock());
+    }
+
+    /**
+     * @return the m_bWakelock as "0" or "1"
+     */
+    public int getWakelockInt() {
+        return getBooleanAsInt(isWakeLock());
+    }
+
+    /**
+     * @return the m_bWifiRunning as "0" or "1"
+     */
+    public String getWifiRunning() {
+        return getBooleanAsString(isWifiRunning());
+    }
+
+    /**
+     * @return the m_bWifiRunning as "0" or "1"
+     */
+    public int getWifiRunningInt() {
+        return getBooleanAsInt(isWifiRunning());
+    }
+
+    /**
+     * @return the m_bGpsOn as "0" or "1"
+     */
+    public String getGpsOn() {
+
+        return getBooleanAsString(isGpsOn());
+    }
+
+    /**
+     * @return the m_bGpsOn as "0" or "1"
+     */
+    public int getGpsOnInt() {
+
+        return getBooleanAsInt(isGpsOn());
+    }
+
+    /**
+     * @return the m_bPhoneInCall as "0" or "1"
+     */
+    public String getPhoneInCall() {
+
+        return getBooleanAsString(isPhoneInCall());
+    }
+
+    /**
+     * @return the m_bPhoneScanning as "0" or "1"
+     */
+    public String getPhoneScanning() {
+        return getBooleanAsString(isPhoneScanning());
+    }
+
+    /**
+     * @return the m_bBluetoothOn as "0" or "1"
+     */
+    public String getBluetoothOn() {
+        return getBooleanAsString(isBluetoothOn());
+    }
+
+    /**
+     * @return the m_bBluetoothInt as integer
+     */
+    public int getBluetoothOnInt() {
+
+        return getBooleanAsInt(isBluetoothOn());
+    }
+
+
+    /**
+     * @return the m_bCharging as "0" or "1"
+     */
+    protected String getBooleanAsString(boolean bVal) {
+        if (bVal) {
+            return "1";
+        } else {
+            return "0";
+        }
+    }
+
+    /**
+     * @return the boolean as 0 or 1
+     */
+    protected int getBooleanAsInt(boolean bVal) {
+        if (bVal) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * @return true is phone is charging
+     */
+    public boolean isCharging() {
+
+        return (m_statesValue & STATE_BATTERY_PLUGGED_FLAG) != 0;
+    }
+
+    /**
+     * @return true if screen is on
+     */
+    public boolean isScreenOn() {
+        return (m_statesValue & STATE_SCREEN_ON_FLAG) != 0;
+    }
+
+    /**
+     * @return true is GPS is on
+     */
+    public boolean isGpsOn() {
+        return (m_statesValue & STATE_GPS_ON_FLAG) != 0;
+    }
+
+    /**
+     * @return true is wifi is running
+     */
+    public boolean isWifiRunning() {
+        return (m_statesValue & STATE_WIFI_RUNNING_FLAG) != 0;
+    }
+
+    /**
+     * @return true is a wakelock is present
+     */
+    public boolean isWakeLock() {
+        return (m_statesValue & STATE_WAKE_LOCK_FLAG) != 0;
+    }
+
+    /**
+     * @return true  if Phone is in Call
+     */
+    public boolean isPhoneInCall() {
+        return (m_statesValue & STATE_PHONE_IN_CALL_FLAG) != 0;
+    }
+
+    /**
+     * @return true if Phone is Scanning
+     */
+    public boolean isPhoneScanning() {
+        return (m_statesValue & STATE_PHONE_SCANNING_FLAG) != 0;
+    }
+
+    /**
+     * @return the true if bluetooth is on
+     */
+    public boolean isBluetoothOn() {
+        return (m_statesValue & STATE_BLUETOOTH_ON_FLAG) != 0;
+    }
+
+
+    public void setOffset(Long offset) {
+        m_offset = offset;
+    }
+
+    /* (non-Javadoc)
+     * @see android.os.Parcelable#describeContents()
+     */
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    /* (non-Javadoc)
+     * @see android.os.Parcelable#writeToParcel(android.os.Parcel, int)
+     */
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        // TODO Auto-generated method stub
+        dest.writeLong(m_time);
+        dest.writeLong(m_offset);
+        dest.writeByte(m_cmd);
+        dest.writeByte(m_batteryLevel);
+        dest.writeByte(m_batteryStatusValue);
+        dest.writeByte(m_batteryHealthValue);
+        dest.writeByte(m_batteryPlugTypeValue);
+        dest.writeString(m_batteryTemperatureValue);
+        dest.writeString(m_batteryVoltageValue);
+        dest.writeInt(m_statesValue);
+    }
 }
diff --git a/src/com/asksven/android/common/privateapiproxies/HistoryItemIcs.java b/src/com/asksven/android/common/privateapiproxies/HistoryItemIcs.java
index a8c656b..9eb0cb6 100644
--- a/src/com/asksven/android/common/privateapiproxies/HistoryItemIcs.java
+++ b/src/com/asksven/android/common/privateapiproxies/HistoryItemIcs.java
@@ -16,26 +16,22 @@
  */
 
 
-import java.io.Serializable;
-
-import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.asksven.android.common.utils.DateUtils;
+import java.io.Serializable;
 
 /**
  * ICS specific Value holder for BatteryStats$HistoryItem
- * @author sven
  *
+ * @author sven
  */
-public class HistoryItemIcs extends HistoryItem implements Serializable, Parcelable
-{
-	static final long serialVersionUID = 1L;
-	public static final byte CMD_NULL = 0;
+public class HistoryItemIcs extends HistoryItem implements Serializable, Parcelable {
+    static final long serialVersionUID = 1L;
+    public static final byte CMD_NULL = 0;
     public static final byte CMD_UPDATE = 1;
     public static final byte CMD_START = 2;
     public static final byte CMD_OVERFLOW = 3;
-    
+
     public byte cmd = CMD_NULL;
     // Constants from SCREEN_BRIGHTNESS_*
     public static final int STATE_BRIGHTNESS_MASK = 0x0000000f;
@@ -49,119 +45,96 @@ public class HistoryItemIcs extends HistoryItem implements Serializable, Parcela
     // Constants from DATA_CONNECTION_*
     public static final int STATE_DATA_CONNECTION_MASK = 0x0000f000;
     public static final int STATE_DATA_CONNECTION_SHIFT = 12;
-    
+
     // These states always appear directly in the first int token
     // of a delta change; they should be ones that change relatively
     // frequently.
-    public static final int STATE_WAKE_LOCK_FLAG = 1<<30;
-    public static final int STATE_SENSOR_ON_FLAG = 1<<29;
-    public static final int STATE_GPS_ON_FLAG = 1<<28;
-    public static final int STATE_PHONE_SCANNING_FLAG = 1<<27;
-    public static final int STATE_WIFI_RUNNING_FLAG = 1<<26;
-    public static final int STATE_WIFI_FULL_LOCK_FLAG = 1<<25;
-    public static final int STATE_WIFI_SCAN_LOCK_FLAG = 1<<24;
-    public static final int STATE_WIFI_MULTICAST_ON_FLAG = 1<<23;
+    public static final int STATE_WAKE_LOCK_FLAG = 1 << 30;
+    public static final int STATE_SENSOR_ON_FLAG = 1 << 29;
+    public static final int STATE_GPS_ON_FLAG = 1 << 28;
+    public static final int STATE_PHONE_SCANNING_FLAG = 1 << 27;
+    public static final int STATE_WIFI_RUNNING_FLAG = 1 << 26;
+    public static final int STATE_WIFI_FULL_LOCK_FLAG = 1 << 25;
+    public static final int STATE_WIFI_SCAN_LOCK_FLAG = 1 << 24;
+    public static final int STATE_WIFI_MULTICAST_ON_FLAG = 1 << 23;
     // These are on the lower bits used for the command; if they change
     // we need to write another int of data.
-    public static final int STATE_AUDIO_ON_FLAG = 1<<22;
-    public static final int STATE_VIDEO_ON_FLAG = 1<<21;
-    public static final int STATE_SCREEN_ON_FLAG = 1<<20;
-    public static final int STATE_BATTERY_PLUGGED_FLAG = 1<<19;
-    public static final int STATE_PHONE_IN_CALL_FLAG = 1<<18;
-    public static final int STATE_WIFI_ON_FLAG = 1<<17;
-    public static final int STATE_BLUETOOTH_ON_FLAG = 1<<16;
-    
+    public static final int STATE_AUDIO_ON_FLAG = 1 << 22;
+    public static final int STATE_VIDEO_ON_FLAG = 1 << 21;
+    public static final int STATE_SCREEN_ON_FLAG = 1 << 20;
+    public static final int STATE_BATTERY_PLUGGED_FLAG = 1 << 19;
+    public static final int STATE_PHONE_IN_CALL_FLAG = 1 << 18;
+    public static final int STATE_WIFI_ON_FLAG = 1 << 17;
+    public static final int STATE_BLUETOOTH_ON_FLAG = 1 << 16;
+
     public static final int MOST_INTERESTING_STATES =
-        STATE_BATTERY_PLUGGED_FLAG | STATE_SCREEN_ON_FLAG
-        | STATE_GPS_ON_FLAG | STATE_PHONE_IN_CALL_FLAG;
-    	
+            STATE_BATTERY_PLUGGED_FLAG | STATE_SCREEN_ON_FLAG
+                    | STATE_GPS_ON_FLAG | STATE_PHONE_IN_CALL_FLAG;
+
     public HistoryItemIcs(Long time, Byte cmd, Byte batteryLevel, Byte batteryStatusValue,
-    		Byte batteryHealthValue, Byte batteryPlugTypeValue,
-    		String batteryTemperatureValue,	String batteryVoltageValue,
-    		Integer	statesValue)
-    {
-    	super(time, cmd, batteryLevel, batteryStatusValue,
-    		batteryHealthValue, batteryPlugTypeValue,
-    		batteryTemperatureValue, batteryVoltageValue,
-    		statesValue);
+                          Byte batteryHealthValue, Byte batteryPlugTypeValue,
+                          String batteryTemperatureValue, String batteryVoltageValue,
+                          Integer statesValue) {
+        super(time, cmd, batteryLevel, batteryStatusValue,
+                batteryHealthValue, batteryPlugTypeValue,
+                batteryTemperatureValue, batteryVoltageValue,
+                statesValue);
+    }
+
+
+    /**
+     * @return true is phone is charging
+     */
+    public boolean isCharging() {
+        return (m_statesValue & STATE_BATTERY_PLUGGED_FLAG) != 0;
+    }
+
+    /**
+     * @return true if screen is on
+     */
+    public boolean isScreenOn() {
+        return (m_statesValue & STATE_SCREEN_ON_FLAG) != 0;
+    }
+
+    /**
+     * @return true is GPS is on
+     */
+    public boolean isGpsOn() {
+        return (m_statesValue & STATE_GPS_ON_FLAG) != 0;
+    }
+
+    /**
+     * @return true is wifi is running
+     */
+    public boolean isWifiRunning() {
+        return (m_statesValue & STATE_WIFI_RUNNING_FLAG) != 0;
+    }
+
+    /**
+     * @return true is a wakelock is present
+     */
+    public boolean isWakeLock() {
+        return (m_statesValue & STATE_WAKE_LOCK_FLAG) != 0;
+    }
+
+    /**
+     * @return true  if Phone is in Call
+     */
+    public boolean isPhoneInCall() {
+        return (m_statesValue & STATE_PHONE_IN_CALL_FLAG) != 0;
+    }
+
+    /**
+     * @return true if Phone is Scanning
+     */
+    public boolean isPhoneScanning() {
+        return (m_statesValue & STATE_PHONE_SCANNING_FLAG) != 0;
+    }
+
+    /**
+     * @return the true if bluetooth is on
+     */
+    public boolean isBluetoothOn() {
+        return (m_statesValue & STATE_BLUETOOTH_ON_FLAG) != 0;
     }
-    
-
-	
-	/**
-	 * @return true is phone is charging
-	 */
-	public boolean isCharging()
-	{
-		boolean bCharging = (m_statesValue & STATE_BATTERY_PLUGGED_FLAG) != 0;
-		
-		return bCharging;
-	}
-
-	/**
-	 * @return true if screen is on
-	 */
-	public boolean isScreenOn()
-	{
-		boolean bScreenOn = (m_statesValue & STATE_SCREEN_ON_FLAG) != 0;
-		return bScreenOn;
-	}
-
-	/**
-	 * @return true is GPS is on
-	 */
-	public boolean isGpsOn()
-	{
-		boolean bGpsOn = (m_statesValue & STATE_GPS_ON_FLAG) != 0;
-		return bGpsOn;
-	}
-	
-	/**
-	 * @return true is wifi is running
-	 */
-	public boolean isWifiRunning()
-	{
-		boolean bWifiRunning = (m_statesValue & STATE_WIFI_RUNNING_FLAG) != 0;
-		return bWifiRunning;
-	}
-
-	/**
-	 * @return true is a wakelock is present
-	 */
-	public boolean isWakeLock()
-	{
-		boolean bWakeLock = (m_statesValue & STATE_WAKE_LOCK_FLAG) != 0;
-		return bWakeLock;
-	}
-
-	/**
-	 * @return true  if Phone is in Call
-	 */
-	public boolean isPhoneInCall()
-	{
-		
-		boolean bPhoneInCall = (m_statesValue & STATE_PHONE_IN_CALL_FLAG) != 0;
-
-		return bPhoneInCall;
-	}
-
-	/**
-	 * @return true if Phone is Scanning
-	 */
-	public boolean isPhoneScanning()
-	{
-		boolean bPhoneScanning = (m_statesValue & STATE_PHONE_SCANNING_FLAG) != 0;
-
-		return bPhoneScanning;
-	}
-
-	/**
-	 * @return the true if bluetooth is on
-	 */
-	public boolean isBluetoothOn()
-	{
-		boolean bBluetoothOn = (m_statesValue & STATE_BLUETOOTH_ON_FLAG) != 0;
-
-		return bBluetoothOn;
-	}
 }
diff --git a/src/com/asksven/android/common/privateapiproxies/KernelWakelock.java b/src/com/asksven/android/common/privateapiproxies/KernelWakelock.java
index 0c6e684..d57523d 100644
--- a/src/com/asksven/android/common/privateapiproxies/KernelWakelock.java
+++ b/src/com/asksven/android/common/privateapiproxies/KernelWakelock.java
@@ -16,175 +16,154 @@
 
 package com.asksven.android.common.privateapiproxies;
 
+import android.util.Log;
+
 import java.io.Serializable;
 import java.util.Comparator;
 import java.util.List;
 
-import android.util.Log;
-
 /**
  * @author sven
- *
  */
-public class KernelWakelock extends StatElement implements Comparable<KernelWakelock>, Serializable
-{	
-	/** 
-	 * the tag for logging
-	 */
-	private static transient final String TAG = "KernelWakelock";
-
-	/**
-	 * the name of the wakelock holder
-	 */
-	private String m_name;
-	
-	/**
-	 * the duration in ms
-	 */
-	private long m_duration;
-
-	/**
-	 * the count
-	 */
-	private int m_count;
-	
-	/**
-	 * Creates a wakelock instance
-	 * @param wakeType the type of wakelock (partial or full)
-	 * @param name the speaking name
-	 * @param duration the duration the wakelock was held
-	 * @param time the battery realtime 
-	 * @param count the number of time the wakelock was active
-	 */
-	public KernelWakelock(String name, long duration, long time, int count)
-	{
-		m_name		= name;
-		m_duration	= duration;
-		setTotal(time);
-		m_count		= count;
-	}
-
-	/**
-	 * Substracts the values from a previous object
-	 * found in myList from the current Process
-	 * in order to obtain an object containing only the data since a referenc
-	 * @param myList
-	 */
-	public void substractFromRef(List<StatElement> myList )
-	{
-		if (myList != null)
-		{
-			for (int i = 0; i < myList.size(); i++)
-			{
-				try
-				{
-					KernelWakelock myRef = (KernelWakelock) myList.get(i);
-					if ( (this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid()) )
-					{
-						this.m_duration	-= myRef.getDuration();
-						this.setTotal( this.getTotal() - myRef.getTotal());
-						this.m_count	-= myRef.getCount();
-
-						if ((m_count < 0) || (m_duration < 0) || (this.getTotal() < 0))
-						{
-							Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
-						}
-					}
-				}
-				catch (ClassCastException e)
-				{
-					// just log as it is no error not to change the process
-					// being substracted from to do nothing
-					Log.e(TAG, "substractFromRef was called with a wrong list type");
-				}
-				
-			}
-		}
-	}
-
-
-	/**
-	 * @return the name
-	 */
-	public String getName()
-	{
-		return m_name;
-	}
-
-	/**
-	 * @return the duration
-	 */
-	public long getDuration()
-	{
-		return m_duration;
-	}
-
-	/**
-	 * @return the count
-	 */
-	public int getCount()
-	{
-		return m_count;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() 
-	{
-		return "Kernel Wakelock [m_name=" + m_name
-				+ ", m_duration=" + m_duration
-				+ ", m_count=" + m_count+ "]";
-	}
-	
-	 /**
+public class KernelWakelock extends StatElement implements Comparable<KernelWakelock>, Serializable {
+    /**
+     * the tag for logging
+     */
+    private static transient final String TAG = "KernelWakelock";
+
+    /**
+     * the name of the wakelock holder
+     */
+    private String m_name;
+
+    /**
+     * the duration in ms
+     */
+    private long m_duration;
+
+    /**
+     * the count
+     */
+    private int m_count;
+
+    /**
+     * Creates a wakelock instance
+     *
+     * @param name     the speaking name
+     * @param duration the duration the wakelock was held
+     * @param time     the battery realtime
+     * @param count    the number of time the wakelock was active
+     */
+    public KernelWakelock(String name, long duration, long time, int count) {
+        m_name = name;
+        m_duration = duration;
+        setTotal(time);
+        m_count = count;
+    }
+
+    /**
+     * Substracts the values from a previous object
+     * found in myList from the current Process
+     * in order to obtain an object containing only the data since a referenc
+     *
+     * @param myList
+     */
+    public void substractFromRef(List<StatElement> myList) {
+        if (myList != null) {
+            for (StatElement aMyList : myList) {
+                try {
+                    KernelWakelock myRef = (KernelWakelock) aMyList;
+                    if ((this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid())) {
+                        this.m_duration -= myRef.getDuration();
+                        this.setTotal(this.getTotal() - myRef.getTotal());
+                        this.m_count -= myRef.getCount();
+
+                        if ((m_count < 0) || (m_duration < 0) || (this.getTotal() < 0)) {
+                            Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
+                        }
+                    }
+                } catch (ClassCastException e) {
+                    // just log as it is no error not to change the process
+                    // being substracted from to do nothing
+                    Log.e(TAG, "substractFromRef was called with a wrong list type");
+                }
+
+            }
+        }
+    }
+
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return m_name;
+    }
+
+    /**
+     * @return the duration
+     */
+    public long getDuration() {
+        return m_duration;
+    }
+
+    /**
+     * @return the count
+     */
+    public int getCount() {
+        return m_count;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Kernel Wakelock [m_name=" + m_name
+                + ", m_duration=" + m_duration
+                + ", m_count=" + m_count + "]";
+    }
+
+    /**
      * Compare a given Wakelock with this object.
-     * If the duration of this object is 
+     * If the duration of this object is
      * greater than the received object,
      * then this object is greater than the other.
      */
-	public int compareTo(KernelWakelock o)
-	{
-		// we want to sort in descending order
-		return ((int)(o.getDuration() - this.getDuration()));
-	}
-	
-	/**
-	 * returns a string representation of the data
-	 */
-	public String getData()
-	{
-		return this.formatDuration(getDuration()) 
-			+ " (" + getDuration()/1000 + " s)"
-			+ " Count:" + getCount()
-			+ " " + this.formatRatio(getDuration(), getTotal());
-	}
-	
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = getDuration();
-		return retVal;
-	}
-	
-	public static class CountComparator implements Comparator<KernelWakelock>
-	{
-		public int compare(KernelWakelock a, KernelWakelock b)
-		{
-			return ((int)(b.getCount() - a.getCount()));
-		}
-	}
-	
-	public static class TimeComparator implements Comparator<KernelWakelock>
-	{
-		public int compare(KernelWakelock a, KernelWakelock b)
-		{
-			return ((int)(b.getDuration() - a.getDuration()));
-		}
-	}
+    public int compareTo(KernelWakelock o) {
+        // we want to sort in descending order
+        return ((int) (o.getDuration() - this.getDuration()));
+    }
+
+    /**
+     * returns a string representation of the data
+     */
+    public String getData() {
+        return this.formatDuration(getDuration())
+                + " (" + getDuration() / 1000 + " s)"
+                + " Count:" + getCount()
+                + " " + this.formatRatio(getDuration(), getTotal());
+    }
+
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = getDuration();
+        return retVal;
+    }
+
+    public static class CountComparator implements Comparator<KernelWakelock> {
+        public int compare(KernelWakelock a, KernelWakelock b) {
+            return b.getCount() - a.getCount();
+        }
+    }
+
+    public static class TimeComparator implements Comparator<KernelWakelock> {
+        public int compare(KernelWakelock a, KernelWakelock b) {
+            return ((int) (b.getDuration() - a.getDuration()));
+        }
+    }
 
 }
diff --git a/src/com/asksven/android/common/privateapiproxies/Misc.java b/src/com/asksven/android/common/privateapiproxies/Misc.java
index 9563dc8..19b9d78 100644
--- a/src/com/asksven/android/common/privateapiproxies/Misc.java
+++ b/src/com/asksven/android/common/privateapiproxies/Misc.java
@@ -15,180 +15,162 @@
  */
 package com.asksven.android.common.privateapiproxies;
 
+import android.util.Log;
+
 import java.io.Serializable;
 import java.util.List;
 
-import android.util.Log;
-
 /**
  * @author sven
- *
  */
-public class Misc extends StatElement implements Comparable<Misc>, Serializable
-{
-	/** 
-	 * the tag for logging
-	 */
-	private static transient final String TAG = "Misc";
-	
-	/**
-	 * the name of the object
-	 */
-	private String m_name;
-	
-	/**
-	 * the time on in ms
-	 */
-	private long m_timeOn;
-	
-	/**
-	 * the time running in ms
-	 */
-	private long m_timeRunning;
-
-	/**
-	 * Constructor
-	 * @param name
-	 * @param timeOn
-	 * @param ratio
-	 */
-	public Misc(String name, long timeOn, long timeRunning)
-	{
-
-		m_name			= name;
-		m_timeOn		= timeOn;
-		m_timeRunning	= timeRunning;
-	}
-
-	/**
-	 * Substracts the values from a previous object
-	 * found in myList from the current Process
-	 * in order to obtain an object containing only the data since a referenc
-	 * @param myList
-	 */
-	public void substractFromRef(List<StatElement> myList )
-	{
-		if (myList != null)
-		{
-			for (int i = 0; i < myList.size(); i++)
-			{
-				try
-				{
-					Misc myRef = (Misc) myList.get(i);
-					if ( (this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid()) )
-					{
+public class Misc extends StatElement implements Comparable<Misc>, Serializable {
+    /**
+     * the tag for logging
+     */
+    private static transient final String TAG = "Misc";
+
+    /**
+     * the name of the object
+     */
+    private String m_name;
+
+    /**
+     * the time on in ms
+     */
+    private long m_timeOn;
+
+    /**
+     * the time running in ms
+     */
+    private long m_timeRunning;
+
+    /**
+     * Constructor
+     *
+     * @param name
+     * @param timeOn
+     * @param ratio
+     */
+    public Misc(String name, long timeOn, long timeRunning) {
+
+        m_name = name;
+        m_timeOn = timeOn;
+        m_timeRunning = timeRunning;
+    }
+
+    /**
+     * Substracts the values from a previous object
+     * found in myList from the current Process
+     * in order to obtain an object containing only the data since a referenc
+     *
+     * @param myList
+     */
+    public void substractFromRef(List<StatElement> myList) {
+        if (myList != null) {
+            for (StatElement aMyList : myList) {
+                try {
+                    Misc myRef = (Misc) aMyList;
+                    if ((this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid())) {
 //						if (this.getName().equals("Deep Sleep"))
 //						{
-							Log.d(TAG, "Substracting " + myRef.getName() + " " + myRef.getVals()
-									+ " from " + this.getName() + " " + this.getVals());
+                        Log.d(TAG, "Substracting " + myRef.getName() + " " + myRef.getVals()
+                                + " from " + this.getName() + " " + this.getVals());
 //						}
-						this.m_timeOn		-= myRef.getTimeOn();
-						this.m_timeRunning	-= myRef.getTimeRunning();
-						
-						if (this.m_timeOn > this.m_timeRunning)
-						{
-							Log.i(TAG, "Fixed rounding difference: " + this.m_timeOn + " -> " + this.m_timeRunning);
-							this.m_timeOn = this.m_timeRunning;
-						}
-
-						if ((m_timeOn < 0) || (m_timeRunning < 0))
-						{
-							Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
-						}
-					}
-				}
-				catch (ClassCastException e)
-				{
-					// just log as it is no error not to change the process
-					// being substracted from to do nothing
-					Log.e(TAG, "substractFromRef was called with a wrong list type");
-				}
-				
-			}
-		}
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName()
-	{
-		return m_name;
-	}
-
-	/**
-	 * @return the time on
-	 */
-	public long getTimeOn()
-	{
-		return m_timeOn;
-	}
-
-	/**
-	 * @return the time running
-	 */
-	public long getTimeRunning()
-	{
-		return m_timeRunning;
-	}
-
-	/**
+                        this.m_timeOn -= myRef.getTimeOn();
+                        this.m_timeRunning -= myRef.getTimeRunning();
+
+                        if (this.m_timeOn > this.m_timeRunning) {
+                            Log.i(TAG, "Fixed rounding difference: " + this.m_timeOn + " -> " + this.m_timeRunning);
+                            this.m_timeOn = this.m_timeRunning;
+                        }
+
+                        if ((m_timeOn < 0) || (m_timeRunning < 0)) {
+                            Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
+                        }
+                    }
+                } catch (ClassCastException e) {
+                    // just log as it is no error not to change the process
+                    // being substracted from to do nothing
+                    Log.e(TAG, "substractFromRef was called with a wrong list type");
+                }
+
+            }
+        }
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return m_name;
+    }
+
+    /**
+     * @return the time on
+     */
+    public long getTimeOn() {
+        return m_timeOn;
+    }
+
+    /**
+     * @return the time running
+     */
+    public long getTimeRunning() {
+        return m_timeRunning;
+    }
+
+    /**
      * Compare a given Wakelock with this object.
-     * If the duration of this object is 
+     * If the duration of this object is
      * greater than the received object,
      * then this object is greater than the other.
      */
-	public int compareTo(Misc o)
-	{
-		// we want to sort in descending order
-		return (int)( o.getTimeOn() - this.getTimeOn());
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "Misc [m_name=" + m_name + ", m_timeOn=" + formatDuration(getTimeOn())
-				+ ", m_timeRunning=" + formatDuration(getTimeRunning()) + "]";
-	}
-
-	/**
-	 * returns a string representation of the data
-	 */
-	public String getData()
-	{
-		
-		return this.formatDuration(getTimeOn()) + " (" + getTimeOn()/1000 + " s)"
-		+ " Ratio: " + formatRatio(getTimeOn()/1000, getTimeRunning()/1000);
-	}
-	
-	/**
-	 * returns a string representation of the data
-	 */
-	String getVals()
-	{
-		
-		return this.formatDuration(getTimeOn()) + " (" + getTimeOn()/1000 + " s)"
-				+ " in " + this.formatDuration(getTimeRunning()) + " (" + getTimeRunning()/1000 + " s)"
-		+ " Ratio: " + formatRatio(getTimeOn()/1000, getTimeRunning()/1000);
-	}
-
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = getTimeOn();
-		return retVal;
-	}
-	
-	public double getMaxValue()
-	{
-		return getTimeOn();            
+    public int compareTo(Misc o) {
+        // we want to sort in descending order
+        return (int) (o.getTimeOn() - this.getTimeOn());
     }
-	
+
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Misc [m_name=" + m_name + ", m_timeOn=" + formatDuration(getTimeOn())
+                + ", m_timeRunning=" + formatDuration(getTimeRunning()) + "]";
+    }
+
+    /**
+     * returns a string representation of the data
+     */
+    public String getData() {
+
+        return this.formatDuration(getTimeOn()) + " (" + getTimeOn() / 1000 + " s)"
+                + " Ratio: " + formatRatio(getTimeOn() / 1000, getTimeRunning() / 1000);
+    }
+
+    /**
+     * returns a string representation of the data
+     */
+    String getVals() {
+
+        return this.formatDuration(getTimeOn()) + " (" + getTimeOn() / 1000 + " s)"
+                + " in " + this.formatDuration(getTimeRunning()) + " (" + getTimeRunning() / 1000 + " s)"
+                + " Ratio: " + formatRatio(getTimeOn() / 1000, getTimeRunning() / 1000);
+    }
+
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = getTimeOn();
+        return retVal;
+    }
+
+    public double getMaxValue() {
+        return getTimeOn();
+    }
+
 }
 
diff --git a/src/com/asksven/android/common/privateapiproxies/NetworkUsage.java b/src/com/asksven/android/common/privateapiproxies/NetworkUsage.java
index 0517f40..5953535 100644
--- a/src/com/asksven/android/common/privateapiproxies/NetworkUsage.java
+++ b/src/com/asksven/android/common/privateapiproxies/NetworkUsage.java
@@ -16,308 +16,258 @@
 
 package com.asksven.android.common.privateapiproxies;
 
-import java.io.Serializable;
-import java.util.Comparator;
-import java.util.List;
-
-import com.asksven.android.common.nameutils.UidInfo;
-
-import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
+import com.asksven.android.common.nameutils.UidInfo;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class NetworkUsage extends StatElement implements Comparable<NetworkUsage>, Serializable {
+    /**
+     * the tag for logging
+     */
+    private static transient final String TAG = "NetworkUsage";
+
+
+    /**
+     * tcpBytes received by the program
+     */
+    private long m_bytesReceived = 0;
+
+    /**
+     * tcpBytes sent by the program
+     */
+    private long m_bytesSent = 0;
+
+    /**
+     * the interface
+     */
+    private String m_iface = "";
+
+
+    /**
+     * @param uid
+     * @param iface
+     * @param bytesReceived
+     * @param bytesSent
+     */
+    public NetworkUsage(int uid, String iface, long bytesReceived, long bytesSent) {
+        super.setUid(uid);
+        m_iface = iface;
+        m_bytesReceived = bytesReceived;
+        m_bytesSent = bytesSent;
+    }
+
+    /**
+     * @param uid
+     * @param bytesReceived
+     * @param bytesSent
+     */
+    public NetworkUsage(int uid, long bytesReceived, long bytesSent) {
+        super.setUid(uid);
+        m_iface = "";
+        m_bytesReceived = bytesReceived;
+        m_bytesSent = bytesSent;
+    }
+
+    /**
+     * Creates an Object by passing its name
+     *
+     * @param name
+     * @param uid
+     * @param bytesReceived
+     * @param bytesSent
+     */
+    public NetworkUsage(String name, int uid, long bytesReceived, long bytesSent) {
+        m_uidInfo = new UidInfo();
+        m_uidInfo.setName(name);
+        m_uidInfo.setUid(uid);
+        super.setUid(uid);
+        m_bytesReceived = bytesReceived;
+        m_bytesSent = bytesSent;
+    }
+
+    /**
+     * Substracts the values from a previous object
+     * found in myList from the current Process
+     * in order to obtain an object containing only the data since a referenc
+     *
+     * @param myList
+     */
+    public void substractFromRef(List<StatElement> myList) {
+        if (myList != null) {
+            for (StatElement aMyList : myList) {
+                try {
+                    NetworkUsage myRef = (NetworkUsage) aMyList;
+                    if ((this.getInterface().equals(myRef.getInterface()))
+                            && (this.getuid() == myRef.getuid())) {
+                        this.m_bytesReceived -= myRef.getBytesReceived();
+                        this.m_bytesSent -= myRef.getBytesSent();
+
+                        if ((m_bytesReceived < 0) || (m_bytesSent < 0)) {
+                            Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
+                        }
+                    }
+                } catch (ClassCastException e) {
+                    // just log as it is no error not to change the process
+                    // being substracted from to do nothing
+                    Log.e(TAG, "substractFromRef was called with a wrong list type");
+                }
+            }
+        }
+    }
+
+
+    /**
+     * @return the interface
+     */
+    public String getInterface() {
+        String ret = "";
+        if (m_iface.startsWith("wlan")) {
+            ret = "Wifi";
+        } else if (m_iface.startsWith("rmnet")) {
+            ret = "Mobile";
+        } else if (m_iface.startsWith("bnep")) {
+            ret = "Bluetooth";
+        } else {
+            ret = m_iface;
+        }
 
-public class NetworkUsage extends StatElement implements Comparable<NetworkUsage>, Serializable
-{
-	/** 
-	 * the tag for logging
-	 */
-	private static transient final String TAG = "NetworkUsage";
-	
-	
-	/**
-	 * tcpBytes received by the program
-	 */
-	private long m_bytesReceived=0;
-	
-	/**
-	 * tcpBytes sent by the program
-	 */
-	private long m_bytesSent=0;
-
-	/**
-	 * the interface
-	 */
-	private String m_iface = "";
-
-
-	/**
-	 * 
-	 * @param uid
-	 * @param iface
-	 * @param bytesReceived
-	 * @param bytesSent
-	 */
-	public NetworkUsage(int uid, String iface, long bytesReceived, long bytesSent)
-	{
-		super.setUid(uid);
-		m_iface			= iface;
-		m_bytesReceived	= bytesReceived;
-		m_bytesSent		= bytesSent;
-	}
-
-	/**
-	 * 
-	 * @param uid
-	 * @param bytesReceived
-	 * @param bytesSent
-	 */
-	public NetworkUsage(int uid, long bytesReceived, long bytesSent)
-	{
-		super.setUid(uid);
-		m_iface			= "";
-		m_bytesReceived	= bytesReceived;
-		m_bytesSent		= bytesSent;
-	}
-
-	/**
-	 * Creates an Object by passing its name
-	 * @param name
-	 * @param uid
-	 * @param bytesReceived
-	 * @param bytesSent
-	 */
-	public NetworkUsage(String name, int uid, long bytesReceived, long bytesSent)
-	{
-		m_uidInfo = new UidInfo();
-		m_uidInfo.setName(name);
-		m_uidInfo.setUid(uid);
-		super.setUid(uid);
-		m_bytesReceived	= bytesReceived;
-		m_bytesSent		= bytesSent;
-	}
-	/**
-	 * Substracts the values from a previous object
-	 * found in myList from the current Process
-	 * in order to obtain an object containing only the data since a referenc
-	 * @param myList
-	 */
-	public void substractFromRef(List<StatElement> myList )
-	{
-		if (myList != null)
-		{
-			for (int i = 0; i < myList.size(); i++)
-			{
-				try
-				{
-					NetworkUsage myRef = (NetworkUsage) myList.get(i);
-					if ( (this.getInterface().equals(myRef.getInterface())) 
-							&& (this.getuid() == myRef.getuid()) )
-					{
-						this.m_bytesReceived	-= myRef.getBytesReceived();
-						this.m_bytesSent		-= myRef.getBytesSent();
-					
-						if ((m_bytesReceived < 0) || (m_bytesSent < 0))
-						{
-							Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
-						}
-					}
-				}
-				catch (ClassCastException e)
-				{
-					// just log as it is no error not to change the process
-					// being substracted from to do nothing
-					Log.e(TAG, "substractFromRef was called with a wrong list type");
-				}	
-			}			
-		}
-	}
-
-
-	/**
-	 * @return the interface
-	 */
-	public String getInterface()
-	{
-		String ret = "";
-		if (m_iface.startsWith("wlan"))
-		{
-			ret = "Wifi";
-		}
-		else if (m_iface.startsWith("rmnet"))
-		{
-			ret = "Mobile";
-		}
-		else if (m_iface.startsWith("bnep"))
-		{
-			ret = "Bluetooth";
-		}
-		else
-		{
-			ret = m_iface;
-		}
-
-		return ret;
-	}
-
-
-	/**
-	 * @return the bytes received
-	 */
-	public long getBytesReceived()
-	{
-		return m_bytesReceived;
-	}
-
-	public void addBytesReceived(long bytes)
-	{
-		m_bytesReceived += bytes;
-	}
-
-	public void addBytesSent(long bytes)
-	{
-		m_bytesSent += bytes;
-	}
-	/**
-	 * @return the bytes sent
-	 */
-	public long getBytesSent()
-	{
-		return m_bytesSent;
-	}
-	
-	/**
-	 * @return the total bytes sent and received
-	 */
-	public long getTotalBytes()
-	{
-		return m_bytesSent + m_bytesReceived;
-	}
-
-	/**
+        return ret;
+    }
+
+
+    /**
+     * @return the bytes received
+     */
+    public long getBytesReceived() {
+        return m_bytesReceived;
+    }
+
+    public void addBytesReceived(long bytes) {
+        m_bytesReceived += bytes;
+    }
+
+    public void addBytesSent(long bytes) {
+        m_bytesSent += bytes;
+    }
+
+    /**
+     * @return the bytes sent
+     */
+    public long getBytesSent() {
+        return m_bytesSent;
+    }
+
+    /**
+     * @return the total bytes sent and received
+     */
+    public long getTotalBytes() {
+        return m_bytesSent + m_bytesReceived;
+    }
+
+    /**
      * Compare a given NetworkUsage with this object.
-     * If the duration of this object is 
+     * If the duration of this object is
      * greater than the received object,
      * then this object is greater than the other.
      */
-	public int compareTo(NetworkUsage o)
-	{
-		// we want to sort in descending order
-		return ((int)((o.getBytesReceived() + o.getBytesSent()) - (this.getBytesReceived() + this.getBytesSent())));
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "NetworkUsage [m_uid=" + super.getuid() + ", m_bytesReceived="
-				+ m_bytesReceived + ", m_bytesSent=" + m_bytesSent + "]";
-	}
-	
-	/**
-	 * Network Stats do not have a speaking name, just the UID
-	 */
-	public String getName()
-	{
-		return String.valueOf(super.getuid() + " (" + getInterface() + ")");
-	}
-	
-	/**
-	 * returns a string representation of the data
-	 */
-	public String getData()
-	{
-		return formatVolume(getTotalBytes()) + " " + this.formatRatio(getTotalBytes(), getTotal());
-		//"RX Bytes: " + String.valueOf(m_bytesReceived) + ", TX Bytes: " + String.valueOf(m_bytesSent);
-	}
-
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = getBytesReceived() + getBytesSent();
+    public int compareTo(NetworkUsage o) {
+        // we want to sort in descending order
+        return ((int) ((o.getBytesReceived() + o.getBytesSent()) - (this.getBytesReceived() + this.getBytesSent())));
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "NetworkUsage [m_uid=" + super.getuid() + ", m_bytesReceived="
+                + m_bytesReceived + ", m_bytesSent=" + m_bytesSent + "]";
+    }
+
+    /**
+     * Network Stats do not have a speaking name, just the UID
+     */
+    public String getName() {
+        return String.valueOf(super.getuid() + " (" + getInterface() + ")");
+    }
+
+    /**
+     * returns a string representation of the data
+     */
+    public String getData() {
+        return formatVolume(getTotalBytes()) + " " + this.formatRatio(getTotalBytes(), getTotal());
+        //"RX Bytes: " + String.valueOf(m_bytesReceived) + ", TX Bytes: " + String.valueOf(m_bytesSent);
+    }
+
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = getBytesReceived() + getBytesSent();
 //		retVal[1] = getBytesReceived() + getBytesSent();
-		return retVal;
-	}
-	
-	/**
-	 * Formats data volumes 
-	 * @param bytes
-	 * @return the formated string
-	 */
-	public static String formatVolume(double bytes)
-	{
-		String ret = "";
-		
-		double kB = Math.floor(bytes / 1024);
-		double mB = Math.floor(bytes / 1024 / 1024);
-		double gB = Math.floor(bytes / 1024 / 1024 / 1024);
-		double tB = Math.floor(bytes / 1024 / 1024 / 1024 / 1024);
-        
-        if (tB > 0)
-        {
+        return retVal;
+    }
+
+    /**
+     * Formats data volumes
+     *
+     * @param bytes
+     * @return the formated string
+     */
+    public static String formatVolume(double bytes) {
+        String ret = "";
+
+        double kB = Math.floor(bytes / 1024);
+        double mB = Math.floor(bytes / 1024 / 1024);
+        double gB = Math.floor(bytes / 1024 / 1024 / 1024);
+        double tB = Math.floor(bytes / 1024 / 1024 / 1024 / 1024);
+
+        if (tB > 0) {
             ret = tB + " TBytes";
-        }
-        else if ( gB > 0)
-        {
+        } else if (gB > 0) {
             ret = gB + " GBytes";
-        }
-        else if ( mB > 0)
-        {
+        } else if (mB > 0) {
             ret = mB + " MBytes";
-        }
-        else if ( kB > 0)
-        {
+        } else if (kB > 0) {
             ret = kB + " KBytes";
-        }
-        else
-        {
+        } else {
             ret = bytes + " Bytes";
         }
         return ret;
-	}
-
-	public Drawable getIcon(Context ctx)
-	{
-		if (m_icon == null)
-		{
-			// retrieve and store the icon for that package
-			if (m_uidInfo != null)
-			{
-				String myPackage = m_uidInfo.getNamePackage();
-				if (!myPackage.equals(""))
-				{
-					PackageManager manager = ctx.getPackageManager();
-					try
-					{
-						m_icon = manager.getApplicationIcon(myPackage);
-					}
-					catch (Exception e)
-					{
-						// nop: no icon found
-						m_icon = null;
-					}
-					
-				}
-			}
-		}
-		return m_icon;
-	}
-
-	public String getPackageName()
-	{
-		if (m_uidInfo != null)
-		{
-			return m_uidInfo.getNamePackage();
-		}
-		else
-		{
-			return "";
-		}
-	}
+    }
+
+    public Drawable getIcon(Context ctx) {
+        if (m_icon == null) {
+            // retrieve and store the icon for that package
+            if (m_uidInfo != null) {
+                String myPackage = m_uidInfo.getNamePackage();
+                if (!myPackage.equals("")) {
+                    PackageManager manager = ctx.getPackageManager();
+                    try {
+                        m_icon = manager.getApplicationIcon(myPackage);
+                    } catch (Exception e) {
+                        // nop: no icon found
+                        m_icon = null;
+                    }
+
+                }
+            }
+        }
+        return m_icon;
+    }
+
+    public String getPackageName() {
+        if (m_uidInfo != null) {
+            return m_uidInfo.getNamePackage();
+        } else {
+            return "";
+        }
+    }
 
 }
diff --git a/src/com/asksven/android/common/privateapiproxies/Process.java b/src/com/asksven/android/common/privateapiproxies/Process.java
index 0a9f974..9c72a69 100644
--- a/src/com/asksven/android/common/privateapiproxies/Process.java
+++ b/src/com/asksven/android/common/privateapiproxies/Process.java
@@ -15,231 +15,199 @@
  */
 package com.asksven.android.common.privateapiproxies;
 
-import java.io.Serializable;
-import java.util.Comparator;
-import java.util.List;
-
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.List;
+
 /**
  * @author sven
- *
  */
-public class Process extends StatElement implements Comparable<Process>, Serializable
-{
-	/** 
-	 * the tag for logging
-	 */
-	private transient static final String TAG = "Process";
-	
-	/**
-	 * the name of the process
-	 */
-	private String m_name;
-	
-	/**
-	 * the system time in ms
-	 */
-	private long m_systemTime;
-	
-	/**
-	 * the user time in ms
-	 */
-	private long m_userTime;
-
-	/**
-	 * the number of starts
-	 */
-	private int m_starts;
-
-	/**
-	 * Constructor
-	 * @param name
-	 * @param userTime
-	 * @param systemTime
-	 * @param starts
-	 */
-	public Process(String name, long userTime, long systemTime, int starts)
-	{
-
-		m_name			= name;
-		m_userTime		= userTime;
-		m_systemTime	= systemTime;
-		m_starts		= starts;
-	}
-
-	/**
-	 * Substracts the values from a previous object
-	 * found in myList from the current Process
-	 * in order to obtain an object containing only the data since a referenc
-	 * @param myList
-	 */
-	public void substractFromRef(List<StatElement> myList )
-	{
-		if (myList != null)
-		{
-			for (int i = 0; i < myList.size(); i++)
-			{
-				try
-				{
-					Process myRef = (Process) myList.get(i);
-					if ( (this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid()) )
-					{
-						this.m_userTime 	-= myRef.getUserTime();
-						this.m_systemTime 	-= myRef.getSystemTime();
-						this.m_starts		-= myRef.getStarts();
-						if ((m_userTime < 0) || (m_systemTime < 0) || (m_starts < 0))
-						{
-							Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
-						}
-					}
-				}
-				catch (ClassCastException e)
-				{
-					// just log as it is no error not to change the process
-					// being substracted from to do nothing
-					Log.e(TAG, "substractFromRef was called with a wrong list type");
-				}
-				
-			}
-		}
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName()
-	{
-		return m_name;
-	}
-
-	/**
-	 * @return the system time
-	 */
-	public long getSystemTime()
-	{
-		return m_systemTime;
-	}
-
-	/**
-	 * @return the user time
-	 */
-	public long getUserTime()
-	{
-		return m_userTime;
-	}
-
-	/**
-	 * @return the number of starts
-	 */
-	public int getStarts()
-	{
-		return m_starts;
-	}
-	
-	/**
+public class Process extends StatElement implements Comparable<Process>, Serializable {
+    /**
+     * the tag for logging
+     */
+    private transient static final String TAG = "Process";
+
+    /**
+     * the name of the process
+     */
+    private String m_name;
+
+    /**
+     * the system time in ms
+     */
+    private long m_systemTime;
+
+    /**
+     * the user time in ms
+     */
+    private long m_userTime;
+
+    /**
+     * the number of starts
+     */
+    private int m_starts;
+
+    /**
+     * Constructor
+     *
+     * @param name
+     * @param userTime
+     * @param systemTime
+     * @param starts
+     */
+    public Process(String name, long userTime, long systemTime, int starts) {
+
+        m_name = name;
+        m_userTime = userTime;
+        m_systemTime = systemTime;
+        m_starts = starts;
+    }
+
+    /**
+     * Substracts the values from a previous object
+     * found in myList from the current Process
+     * in order to obtain an object containing only the data since a referenc
+     *
+     * @param myList
+     */
+    public void substractFromRef(List<StatElement> myList) {
+        if (myList != null) {
+            for (StatElement aMyList : myList) {
+                try {
+                    Process myRef = (Process) aMyList;
+                    if ((this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid())) {
+                        this.m_userTime -= myRef.getUserTime();
+                        this.m_systemTime -= myRef.getSystemTime();
+                        this.m_starts -= myRef.getStarts();
+                        if ((m_userTime < 0) || (m_systemTime < 0) || (m_starts < 0)) {
+                            Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
+                        }
+                    }
+                } catch (ClassCastException e) {
+                    // just log as it is no error not to change the process
+                    // being substracted from to do nothing
+                    Log.e(TAG, "substractFromRef was called with a wrong list type");
+                }
+
+            }
+        }
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return m_name;
+    }
+
+    /**
+     * @return the system time
+     */
+    public long getSystemTime() {
+        return m_systemTime;
+    }
+
+    /**
+     * @return the user time
+     */
+    public long getUserTime() {
+        return m_userTime;
+    }
+
+    /**
+     * @return the number of starts
+     */
+    public int getStarts() {
+        return m_starts;
+    }
+
+    /**
      * Compare a given Wakelock with this object.
-     * If the duration of this object is 
+     * If the duration of this object is
      * greater than the received object,
      * then this object is greater than the other.
      */
-	public int compareTo(Process o)
-	{
-		// we want to sort in descending order
-		return ((int)( (o.getSystemTime() + o.getUserTime()) - (this.getSystemTime() + this.getUserTime())));
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString()
-	{
-		return "Process [m_name=" + m_name + ", m_systemTime=" + m_systemTime
-				+ ", m_userTime=" + m_userTime + ", m_starts=" + m_starts + "]";
-	}
-	
-	/**
-	 * returns a string representation of the data
-	 */
-	public String getData()
-	{
-		
-		return "Uid: " + this.getuid() + " Sys: " + this.formatDuration(getSystemTime()) + " (" + getSystemTime()/1000 + " s)"
-		+ " Us: " + this.formatDuration(getUserTime()) + " (" + getUserTime()/1000 + " s)"
-		+ " Starts: " + String.valueOf(getStarts());
-	}
-
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = getUserTime();
-		retVal[1] = getUserTime() + getSystemTime();
-		return retVal;
-	}
-	
-	public static class ProcessCountComparator implements Comparator<Process>
-	{
-		public int compare(Process a, Process b)
-		{
-			return ((int)(b.getStarts() - a.getStarts()));
-		}
-	}
-	
-	public static class ProcessTimeComparator implements Comparator<Process>
-	{
-		public int compare(Process a, Process b)
-		{
-			return ((int)((b.getSystemTime() + b.getUserTime())
-					- (a.getSystemTime() + a.getUserTime())));
-		}
-	}
-	
-	public Drawable getIcon(Context ctx)
-	{
-		if (m_icon == null)
-		{
-			// retrieve and store the icon for that package
-			if (m_uidInfo != null)
-			{
-				String myPackage = m_uidInfo.getNamePackage();
-				if (!myPackage.equals(""))
-				{
-					PackageManager manager = ctx.getPackageManager();
-					try
-					{
-						m_icon = manager.getApplicationIcon(myPackage);
-					}
-					catch (Exception e)
-					{
-						// nop: no icon found
-						m_icon = null;
-					}
-					
-				}
-			}
-		}
-		return m_icon;
-	}
-
-	public String getPackageName()
-	{
-		if (m_uidInfo != null)
-		{
-			return m_uidInfo.getNamePackage();
-		}
-		else
-		{
-			return "";
-		}
-	}
-	
+    public int compareTo(Process o) {
+        // we want to sort in descending order
+        return ((int) ((o.getSystemTime() + o.getUserTime()) - (this.getSystemTime() + this.getUserTime())));
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Process [m_name=" + m_name + ", m_systemTime=" + m_systemTime
+                + ", m_userTime=" + m_userTime + ", m_starts=" + m_starts + "]";
+    }
+
+    /**
+     * returns a string representation of the data
+     */
+    public String getData() {
+
+        return "Uid: " + this.getuid() + " Sys: " + this.formatDuration(getSystemTime()) + " (" + getSystemTime() / 1000 + " s)"
+                + " Us: " + this.formatDuration(getUserTime()) + " (" + getUserTime() / 1000 + " s)"
+                + " Starts: " + String.valueOf(getStarts());
+    }
+
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = getUserTime();
+        retVal[1] = getUserTime() + getSystemTime();
+        return retVal;
+    }
+
+    public static class ProcessCountComparator implements Comparator<Process> {
+        public int compare(Process a, Process b) {
+            return ((int) (b.getStarts() - a.getStarts()));
+        }
+    }
+
+    public static class ProcessTimeComparator implements Comparator<Process> {
+        public int compare(Process a, Process b) {
+            return ((int) ((b.getSystemTime() + b.getUserTime())
+                    - (a.getSystemTime() + a.getUserTime())));
+        }
+    }
+
+    public Drawable getIcon(Context ctx) {
+        if (m_icon == null) {
+            // retrieve and store the icon for that package
+            if (m_uidInfo != null) {
+                String myPackage = m_uidInfo.getNamePackage();
+                if (!myPackage.equals("")) {
+                    PackageManager manager = ctx.getPackageManager();
+                    try {
+                        m_icon = manager.getApplicationIcon(myPackage);
+                    } catch (Exception e) {
+                        // nop: no icon found
+                        m_icon = null;
+                    }
+
+                }
+            }
+        }
+        return m_icon;
+    }
+
+    public String getPackageName() {
+        if (m_uidInfo != null) {
+            return m_uidInfo.getNamePackage();
+        } else {
+            return "";
+        }
+    }
+
 
 }
 
diff --git a/src/com/asksven/android/common/privateapiproxies/StatElement.java b/src/com/asksven/android/common/privateapiproxies/StatElement.java
index 937483c..1012cb8 100644
--- a/src/com/asksven/android/common/privateapiproxies/StatElement.java
+++ b/src/com/asksven/android/common/privateapiproxies/StatElement.java
@@ -1,170 +1,160 @@
 /**
- * 
+ *
  */
 package com.asksven.android.common.privateapiproxies;
 
-import java.io.Serializable;
-import java.util.Formatter;
-
 import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
-
 import com.asksven.android.common.nameutils.UidInfo;
 import com.asksven.android.common.nameutils.UidNameResolver;
 
+import java.io.Serializable;
+import java.util.Formatter;
+
 /**
  * @author sven
- *
  */
-public abstract class StatElement implements Serializable
-{
-	/**
-	 * The process uid
-	 */
-	private int m_uid = -1;
-	/**
-	 * The resolved name info
-	 */
-	protected transient UidInfo m_uidInfo;
-
-	/**
-	 * the battery realtime time
-	 */
-	private long m_total;	
-	/**
-	 * Set the uid
-	 * @param uid a process uid
-	 */
-	public void setUid(int uid)
-	{
-		m_uid = uid;
-	}
-	
-	protected transient Drawable m_icon;
-	
-	/**
-	 * Get the uid
-	 * @return the process uid
-	 */
-	public int getuid()
-	{
-		return m_uid;
-	}
-	
-	/**
-	 * Store the name info
-	 * @param myInfo (@see com.android.asksven.common.nameutils.UidNameResolver)
-	 */
-	public void setUidInfo(UidInfo myInfo)
-	{
-		m_uidInfo = myInfo;
-	}
-	
-	/**
-	 * Returns the full qualified name
-	 * @return the full qualified name
-	 */
-	public String getFullQualifiedName(Context context)
-	{
-		String ret = "";
-		
-		if (m_uidInfo == null)
-		{
-			// may have been left out for lazy loading
-			if (m_uid != -1)
-			{
-				UidNameResolver m_nameResolver = new UidNameResolver();
-				m_uidInfo = m_nameResolver.getNameForUid(context, m_uid);
-			}
-			else
-			{
-				return ret;
-			}
-		}
-		
-		if (!m_uidInfo.getNamePackage().equals(""))
-		{
-			ret = m_uidInfo.getNamePackage() + ".";
-		}
-		ret += m_uidInfo.getName();
-		
-		return ret;
-			
-	}
-	
-	/**
-	 * Returns the full qualified name (default, can be overwritten)
-	 * @return the full qualified name
-	 */
-	public String getFqn(Context context)
-	{
-		return getFullQualifiedName(context);
-	}
-	
-	
-
-	/**
-	 * Returns the associated UidInfo
-	 * @return the UidInfo
-	 */
-	public UidInfo getUidInfo()
-	{
-		return m_uidInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return m_uidInfo.toString();
-	}
-	
-	/**
-	 * Returns a speaking name
-	 * @return the name
-	 */
-	public abstract String getName();
-	
-	/**
-	 * Returns data as displayable string
-	 * @return the data
-	 */
-	public abstract String getData();
-	
-	/**
-	 * @return the m_totalTime
-	 */
-	public long getTotal()
-	{
-		return m_total;
-	}
-
-	/**
-	 * @param m_totalTime the total time to set
-	 */
-	public void setTotal(long total)
-	{
-		this.m_total = total;
-	}
-
-	/**
-	 * Formats milliseconds to a friendly form 
-	 * @param millis
-	 * @return the formated string
-	 */
-	protected String formatDuration(double millis)
-	{
-		String ret = "";
-		
+public abstract class StatElement implements Serializable {
+    /**
+     * The process uid
+     */
+    private int m_uid = -1;
+    /**
+     * The resolved name info
+     */
+    protected transient UidInfo m_uidInfo;
+
+    /**
+     * the battery realtime time
+     */
+    private long m_total;
+
+    /**
+     * Set the uid
+     *
+     * @param uid a process uid
+     */
+    public void setUid(int uid) {
+        m_uid = uid;
+    }
+
+    protected transient Drawable m_icon;
+
+    /**
+     * Get the uid
+     *
+     * @return the process uid
+     */
+    public int getuid() {
+        return m_uid;
+    }
+
+    /**
+     * Store the name info
+     *
+     * @param myInfo (@see com.android.asksven.common.nameutils.UidNameResolver)
+     */
+    public void setUidInfo(UidInfo myInfo) {
+        m_uidInfo = myInfo;
+    }
+
+    /**
+     * Returns the full qualified name
+     *
+     * @return the full qualified name
+     */
+    public String getFullQualifiedName(Context context) {
+        String ret = "";
+
+        if (m_uidInfo == null) {
+            // may have been left out for lazy loading
+            if (m_uid != -1) {
+                UidNameResolver m_nameResolver = new UidNameResolver();
+                m_uidInfo = m_nameResolver.getNameForUid(context, m_uid);
+            } else {
+                return ret;
+            }
+        }
+
+        if (!m_uidInfo.getNamePackage().equals("")) {
+            ret = m_uidInfo.getNamePackage() + ".";
+        }
+        ret += m_uidInfo.getName();
+
+        return ret;
+
+    }
+
+    /**
+     * Returns the full qualified name (default, can be overwritten)
+     *
+     * @return the full qualified name
+     */
+    public String getFqn(Context context) {
+        return getFullQualifiedName(context);
+    }
+
+
+    /**
+     * Returns the associated UidInfo
+     *
+     * @return the UidInfo
+     */
+    public UidInfo getUidInfo() {
+        return m_uidInfo;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return m_uidInfo.toString();
+    }
+
+    /**
+     * Returns a speaking name
+     *
+     * @return the name
+     */
+    public abstract String getName();
+
+    /**
+     * Returns data as displayable string
+     *
+     * @return the data
+     */
+    public abstract String getData();
+
+    /**
+     * @return the m_totalTime
+     */
+    public long getTotal() {
+        return m_total;
+    }
+
+    /**
+     * @param total the total time to set
+     */
+    public void setTotal(long total) {
+        this.m_total = total;
+    }
+
+    /**
+     * Formats milliseconds to a friendly form
+     *
+     * @param millis milliseconds to format
+     * @return the formatted string
+     */
+    protected String formatDuration(double millis) {
+        String ret = "";
+
         int seconds = (int) Math.floor(millis / 1000);
-        
+
         int days = 0, hours = 0, minutes = 0;
-        if (seconds > (60*60*24)) {
-            days = seconds / (60*60*24);
-            seconds -= days * (60*60*24);
+        if (seconds > (60 * 60 * 24)) {
+            days = seconds / (60 * 60 * 24);
+            seconds -= days * (60 * 60 * 24);
         }
         if (seconds > (60 * 60)) {
             hours = seconds / (60 * 60);
@@ -175,78 +165,67 @@ protected String formatDuration(double millis)
             seconds -= minutes * 60;
         }
         ret = "";
-        if (days > 0)
-        {
+        if (days > 0) {
             ret += days + " d ";
         }
-        
-        if (hours > 0)
-        {
-        	ret += hours + " h ";
+
+        if (hours > 0) {
+            ret += hours + " h ";
         }
-        
-        if (minutes > 0)
-        { 
-        	ret += minutes + " m ";
+
+        if (minutes > 0) {
+            ret += minutes + " m ";
         }
-        if (seconds > 0)
-        {
-        	ret += seconds + " s ";
+        if (seconds > 0) {
+            ret += seconds + " s ";
         }
-        
+
         return ret;
     }
-	
-	public final String formatRatio(long num, long den)
-	{
-		StringBuilder mFormatBuilder = new StringBuilder(8);
-	    Formatter mFormatter = new Formatter(mFormatBuilder);
-        if (den == 0L)
-        {
+
+    public final String formatRatio(long num, long den) {
+        StringBuilder mFormatBuilder = new StringBuilder(8);
+        Formatter mFormatter = new Formatter(mFormatBuilder);
+        if (den == 0L) {
             return "---%";
         }
-        
-        float perc = ((float)num) / ((float)den) * 100;
+
+        float perc = ((float) num) / ((float) den) * 100;
         mFormatBuilder.setLength(0);
         mFormatter.format("%.1f%%", perc);
         return mFormatBuilder.toString();
     }
-	
-	/** 
-	 * returns the representation of the data for file dimp
-	 */	
-	public String getDumpData(Context context)
-	{
-		return this.getName() + " (" + this.getFqn(context) + "): " + this.getData();
-	}
-
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = m_total;
-		return retVal;
-	}
-
-
-	/** 
-	 * returns the max of the data
-	 */	
-	public double getMaxValue()
-	{
-		return getValues()[0]; //m_totalTime;
-	}
-	
-	public Drawable getIcon(Context ctx)
-	{
-		return m_icon;
-	}
-	
-	public String getPackageName()
-	{
-		return "";
-	}
+
+    /**
+     * returns the representation of the data for file dimp
+     */
+    public String getDumpData(Context context) {
+        return this.getName() + " (" + this.getFqn(context) + "): " + this.getData();
+    }
+
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = m_total;
+        return retVal;
+    }
+
+
+    /**
+     * returns the max of the data
+     */
+    public double getMaxValue() {
+        return getValues()[0]; //m_totalTime;
+    }
+
+    public Drawable getIcon(Context ctx) {
+        return m_icon;
+    }
+
+    public String getPackageName() {
+        return "";
+    }
 
 }
diff --git a/src/com/asksven/android/common/privateapiproxies/SystemPropertiesProxy.java b/src/com/asksven/android/common/privateapiproxies/SystemPropertiesProxy.java
index 6e4c69d..bbbf412 100644
--- a/src/com/asksven/android/common/privateapiproxies/SystemPropertiesProxy.java
+++ b/src/com/asksven/android/common/privateapiproxies/SystemPropertiesProxy.java
@@ -17,55 +17,56 @@
 package com.asksven.android.common.privateapiproxies;
 
 
-import java.io.File;
-import java.lang.reflect.Method;
 import android.content.Context;
 import dalvik.system.DexFile;
 
+import java.io.File;
+import java.lang.reflect.Method;
 
-public class SystemPropertiesProxy
-{
 
-/**
- * This class cannot be instantiated
- */
-private SystemPropertiesProxy(){
+public class SystemPropertiesProxy {
 
-}
+    /**
+     * This class cannot be instantiated
+     */
+    private SystemPropertiesProxy() {
+
+    }
 
     /**
      * Get the value for the given key.
+     *
      * @return an empty string if the key isn't found
      * @throws IllegalArgumentException if the key exceeds 32 characters
      */
     public static String get(Context context, String key) throws IllegalArgumentException {
 
-        String ret= "";
+        String ret = "";
 
-        try{
+        try {
 
-          ClassLoader cl = context.getClassLoader(); 
-          @SuppressWarnings("rawtypes")
-          Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
 
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-              Class[] paramTypes= new Class[1];
-          paramTypes[0]= String.class;
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[1];
+            paramTypes[0] = String.class;
 
-          @SuppressWarnings("unchecked")
-		  Method get = SystemProperties.getMethod("get", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method get = SystemProperties.getMethod("get", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[1];
-          params[0]= new String(key);
+            //Parameters
+            Object[] params = new Object[1];
+            params[0] = key;
 
-          ret= (String) get.invoke(SystemProperties, params);
+            ret = (String) get.invoke(SystemProperties, params);
 
-        }catch( IllegalArgumentException iAE ){
+        } catch (IllegalArgumentException iAE) {
             throw iAE;
-        }catch( Exception e ){
-            ret= "";
+        } catch (Exception e) {
+            ret = "";
             //TODO
         }
 
@@ -75,39 +76,40 @@ public static String get(Context context, String key) throws IllegalArgumentExce
 
     /**
      * Get the value for the given key.
+     *
      * @return if the key isn't found, return def if it isn't null, or an empty string otherwise
      * @throws IllegalArgumentException if the key exceeds 32 characters
      */
     public static String get(Context context, String key, String def) throws IllegalArgumentException {
 
-        String ret= def;
+        String ret = def;
 
-        try{
+        try {
 
-          ClassLoader cl = context.getClassLoader(); 
-          @SuppressWarnings("rawtypes")
-          Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
 
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-              Class[] paramTypes= new Class[2];
-          paramTypes[0]= String.class;
-          paramTypes[1]= String.class;          
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = String.class;
 
-          @SuppressWarnings("unchecked")
-		  Method get = SystemProperties.getMethod("get", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method get = SystemProperties.getMethod("get", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new String(key);
-          params[1]= new String(def);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = key;
+            params[1] = def;
 
-          ret= (String) get.invoke(SystemProperties, params);
+            ret = (String) get.invoke(SystemProperties, params);
 
-        }catch( IllegalArgumentException iAE ){
+        } catch (IllegalArgumentException iAE) {
             throw iAE;
-        }catch( Exception e ){
-            ret= def;
+        } catch (Exception e) {
+            ret = def;
             //TODO
         }
 
@@ -117,6 +119,7 @@ public static String get(Context context, String key, String def) throws Illegal
 
     /**
      * Get the value for the given key, and return as an integer.
+     *
      * @param key the key to lookup
      * @param def a default value to return
      * @return the key parsed as an integer, or def if the key isn't found or
@@ -125,34 +128,34 @@ public static String get(Context context, String key, String def) throws Illegal
      */
     public static Integer getInt(Context context, String key, int def) throws IllegalArgumentException {
 
-        Integer ret= def;
+        Integer ret = def;
 
-        try{
+        try {
 
-          ClassLoader cl = context.getClassLoader(); 
-          @SuppressWarnings("rawtypes")
-          Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
 
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-              Class[] paramTypes= new Class[2];
-          paramTypes[0]= String.class;
-          paramTypes[1]= int.class;  
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = int.class;
 
-          @SuppressWarnings("unchecked")
-		  Method getInt = SystemProperties.getMethod("getInt", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method getInt = SystemProperties.getMethod("getInt", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new String(key);
-          params[1]= new Integer(def);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = key;
+            params[1] = def;
 
-          ret= (Integer) getInt.invoke(SystemProperties, params);
+            ret = (Integer) getInt.invoke(SystemProperties, params);
 
-        }catch( IllegalArgumentException iAE ){
+        } catch (IllegalArgumentException iAE) {
             throw iAE;
-        }catch( Exception e ){
-            ret= def;
+        } catch (Exception e) {
+            ret = def;
             //TODO
         }
 
@@ -162,6 +165,7 @@ public static Integer getInt(Context context, String key, int def) throws Illega
 
     /**
      * Get the value for the given key, and return as a long.
+     *
      * @param key the key to lookup
      * @param def a default value to return
      * @return the key parsed as a long, or def if the key isn't found or
@@ -170,34 +174,34 @@ public static Integer getInt(Context context, String key, int def) throws Illega
      */
     public static Long getLong(Context context, String key, long def) throws IllegalArgumentException {
 
-        Long ret= def;
+        Long ret = def;
 
-        try{
+        try {
 
-          ClassLoader cl = context.getClassLoader();
-          @SuppressWarnings("rawtypes")
-              Class SystemProperties= cl.loadClass("android.os.SystemProperties");
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
 
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-              Class[] paramTypes= new Class[2];
-          paramTypes[0]= String.class;
-          paramTypes[1]= long.class;  
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = long.class;
 
-          @SuppressWarnings("unchecked")
-		  Method getLong = SystemProperties.getMethod("getLong", paramTypes);
+            @SuppressWarnings("unchecked")
+            Method getLong = SystemProperties.getMethod("getLong", paramTypes);
 
-          //Parameters
-          Object[] params= new Object[2];
-          params[0]= new String(key);
-          params[1]= new Long(def);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = key;
+            params[1] = def;
 
-          ret= (Long) getLong.invoke(SystemProperties, params);
+            ret = (Long) getLong.invoke(SystemProperties, params);
 
-        }catch( IllegalArgumentException iAE ){
+        } catch (IllegalArgumentException iAE) {
             throw iAE;
-        }catch( Exception e ){
-            ret= def;
+        } catch (Exception e) {
+            ret = def;
             //TODO
         }
 
@@ -212,6 +216,7 @@ public static Long getLong(Context context, String key, long def) throws Illegal
      * (case insensitive).
      * If the key does not exist, or has any other value, then the default
      * result is returned.
+     *
      * @param key the key to lookup
      * @param def a default value to return
      * @return the key parsed as a boolean, or def if the key isn't found or is
@@ -220,33 +225,33 @@ public static Long getLong(Context context, String key, long def) throws Illegal
      */
     public static Boolean getBoolean(Context context, String key, boolean def) throws IllegalArgumentException {
 
-        Boolean ret= def;
+        Boolean ret = def;
 
-        try{
+        try {
 
-          ClassLoader cl = context.getClassLoader(); 
-          @SuppressWarnings("rawtypes")
-          Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
 
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-              Class[] paramTypes= new Class[2];
-          paramTypes[0]= String.class;
-          paramTypes[1]= boolean.class;  
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = boolean.class;
 
-          Method getBoolean = SystemProperties.getMethod("getBoolean", paramTypes);
+            Method getBoolean = SystemProperties.getMethod("getBoolean", paramTypes);
 
-          //Parameters         
-          Object[] params= new Object[2];
-          params[0]= new String(key);
-          params[1]= new Boolean(def);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = key;
+            params[1] = def;
 
-          ret= (Boolean) getBoolean.invoke(SystemProperties, params);
+            ret = (Boolean) getBoolean.invoke(SystemProperties, params);
 
-        }catch( IllegalArgumentException iAE ){
+        } catch (IllegalArgumentException iAE) {
             throw iAE;
-        }catch( Exception e ){
-            ret= def;
+        } catch (Exception e) {
+            ret = def;
             //TODO
         }
 
@@ -256,38 +261,39 @@ public static Boolean getBoolean(Context context, String key, boolean def) throw
 
     /**
      * Set the value for the given key.
+     *
      * @throws IllegalArgumentException if the key exceeds 32 characters
      * @throws IllegalArgumentException if the value exceeds 92 characters
      */
     public static void set(Context context, String key, String val) throws IllegalArgumentException {
 
-        try{
+        try {
 
-          @SuppressWarnings("unused")
-          DexFile df = new DexFile(new File("/system/app/Settings.apk"));
-          @SuppressWarnings("unused")
-          ClassLoader cl = context.getClassLoader(); 
-          @SuppressWarnings("rawtypes")
-          Class SystemProperties = Class.forName("android.os.SystemProperties");
+            @SuppressWarnings("unused")
+            DexFile df = new DexFile(new File("/system/app/Settings.apk"));
+            @SuppressWarnings("unused")
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = Class.forName("android.os.SystemProperties");
 
-          //Parameters Types
-          @SuppressWarnings("rawtypes")
-              Class[] paramTypes= new Class[2];
-          paramTypes[0]= String.class;
-          paramTypes[1]= String.class;  
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = String.class;
 
-          Method set = SystemProperties.getMethod("set", paramTypes);
+            Method set = SystemProperties.getMethod("set", paramTypes);
 
-          //Parameters         
-          Object[] params= new Object[2];
-          params[0]= new String(key);
-          params[1]= new String(val);
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = key;
+            params[1] = val;
 
-          set.invoke(SystemProperties, params);
+            set.invoke(SystemProperties, params);
 
-        }catch( IllegalArgumentException iAE ){
+        } catch (IllegalArgumentException iAE) {
             throw iAE;
-        }catch( Exception e ){
+        } catch (Exception e) {
             //TODO
         }
 
diff --git a/src/com/asksven/android/common/privateapiproxies/Wakelock.java b/src/com/asksven/android/common/privateapiproxies/Wakelock.java
index 3397cd2..1bdf62f 100644
--- a/src/com/asksven/android/common/privateapiproxies/Wakelock.java
+++ b/src/com/asksven/android/common/privateapiproxies/Wakelock.java
@@ -16,229 +16,199 @@
 
 package com.asksven.android.common.privateapiproxies;
 
-import java.io.Serializable;
-import java.util.Comparator;
-import java.util.List;
-
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.List;
+
 /**
  * @author sven
- *
  */
-public class Wakelock extends StatElement implements Comparable<Wakelock>, Serializable
-{	
-	/** 
-	 * the tag for logging
-	 */
-	private static transient final String TAG = "Wakelock";
-
-	/**
-	 * the wakelock type
-	 */
-	private int m_wakeType;
-	
-	/**
-	 * the name of the wakelock holder
-	 */
-	private String m_name;
-	
-	/**
-	 * the duration in ms
-	 */
-	private long m_duration;
-	
-
-
-	/**
-	 * the count
-	 */
-	private int m_count;
-	
-	/**
-	 * Creates a wakelock instance
-	 * @param wakeType the type of wakelock (partial or full)
-	 * @param name the speaking name
-	 * @param duration the duration the wakelock was held
-	 * @param time the battery realtime 
-	 * @param count the number of time the wakelock was active
-	 */
-	public Wakelock(int wakeType, String name, long duration, long time, int count)
-	{
-		m_wakeType	= wakeType;
-		m_name		= name;
-		m_duration	= duration;
-		setTotal(time);
-		m_count		= count;
-	}
-
-	/**
-	 * Substracts the values from a previous object
-	 * found in myList from the current Process
-	 * in order to obtain an object containing only the data since a referenc
-	 * @param myList
-	 */
-	public void substractFromRef(List<StatElement> myList )
-	{
-		if (myList != null)
-		{
-			for (int i = 0; i < myList.size(); i++)
-			{
-				try
-				{
-					Wakelock myRef = (Wakelock) myList.get(i);
-					if ( (this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid()) )
-					{
-						Log.i(TAG, "Substraction " + myRef.toString() + " from " + this.toString());
-						this.m_duration	-= myRef.getDuration();
-						this.setTotal( getTotal() - myRef.getTotal());
-						this.m_count	-= myRef.getCount();
-						Log.i(TAG, "Result: " + this.toString());
-						if ((m_count < 0) || (m_duration < 0) || (getTotal() < 0))
-						{
-							Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
-						}
-					}
-				}
-				catch (ClassCastException e)
-				{
-					// just log as it is no error not to change the process
-					// being substracted from to do nothing
-					Log.e(TAG, "substractFromRef was called with a wrong list type");
-				}
-				
-			}
-		}
-	}
-
-	/**
-	 * @return the wakeType
-	 */
-	public int getWakeType() {
-		return m_wakeType;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return m_name;
-	}
-
-	/**
-	 * @return the duration
-	 */
-	public long getDuration() {
-		return m_duration;
-	}
-
-	/**
-	 * @return the count
-	 */
-	public int getCount() {
-		return m_count;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "Wakelock [m_wakeType=" + m_wakeType + ", m_name=" + m_name
-				+ ", m_duration=" + m_duration + "]";
-	}
-	
-	 /**
+public class Wakelock extends StatElement implements Comparable<Wakelock>, Serializable {
+    /**
+     * the tag for logging
+     */
+    private static transient final String TAG = "Wakelock";
+
+    /**
+     * the wakelock type
+     */
+    private int m_wakeType;
+
+    /**
+     * the name of the wakelock holder
+     */
+    private String m_name;
+
+    /**
+     * the duration in ms
+     */
+    private long m_duration;
+
+
+    /**
+     * the count
+     */
+    private int m_count;
+
+    /**
+     * Creates a wakelock instance
+     *
+     * @param wakeType the type of wakelock (partial or full)
+     * @param name     the speaking name
+     * @param duration the duration the wakelock was held
+     * @param time     the battery realtime
+     * @param count    the number of time the wakelock was active
+     */
+    public Wakelock(int wakeType, String name, long duration, long time, int count) {
+        m_wakeType = wakeType;
+        m_name = name;
+        m_duration = duration;
+        setTotal(time);
+        m_count = count;
+    }
+
+    /**
+     * Substracts the values from a previous object
+     * found in myList from the current Process
+     * in order to obtain an object containing only the data since a referenc
+     *
+     * @param myList
+     */
+    public void substractFromRef(List<StatElement> myList) {
+        if (myList != null) {
+            for (StatElement aMyList : myList) {
+                try {
+                    Wakelock myRef = (Wakelock) aMyList;
+                    if ((this.getName().equals(myRef.getName())) && (this.getuid() == myRef.getuid())) {
+                        Log.i(TAG, "Substraction " + myRef.toString() + " from " + this.toString());
+                        this.m_duration -= myRef.getDuration();
+                        this.setTotal(getTotal() - myRef.getTotal());
+                        this.m_count -= myRef.getCount();
+                        Log.i(TAG, "Result: " + this.toString());
+                        if ((m_count < 0) || (m_duration < 0) || (getTotal() < 0)) {
+                            Log.e(TAG, "substractFromRef generated negative values (" + this.toString() + " - " + myRef.toString() + ")");
+                        }
+                    }
+                } catch (ClassCastException e) {
+                    // just log as it is no error not to change the process
+                    // being substracted from to do nothing
+                    Log.e(TAG, "substractFromRef was called with a wrong list type");
+                }
+
+            }
+        }
+    }
+
+    /**
+     * @return the wakeType
+     */
+    public int getWakeType() {
+        return m_wakeType;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return m_name;
+    }
+
+    /**
+     * @return the duration
+     */
+    public long getDuration() {
+        return m_duration;
+    }
+
+    /**
+     * @return the count
+     */
+    public int getCount() {
+        return m_count;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Wakelock [m_wakeType=" + m_wakeType + ", m_name=" + m_name
+                + ", m_duration=" + m_duration + "]";
+    }
+
+    /**
      * Compare a given Wakelock with this object.
-     * If the duration of this object is 
+     * If the duration of this object is
      * greater than the received object,
      * then this object is greater than the other.
      */
-	public int compareTo(Wakelock o)
-	{
-		// we want to sort in descending order
-		return ((int)(o.getDuration() - this.getDuration()));
-	}
-	
-	/**
-	 * returns a string representation of the data
-	 */
-	public String getData()
-	{
-		return this.formatDuration(getDuration()) 
-			+ " (" + getDuration()/1000 + " s)"
-			+ " Count:" + getCount()
-			+ " " + this.formatRatio(getDuration(), getTotal());
-	}
-	
-	/** 
-	 * returns the values of the data
-	 */	
-	public double[] getValues()
-	{
-		double[] retVal = new double[2];
-		retVal[0] = getDuration();
-		return retVal;
-	}
-	
-	public static class WakelockCountComparator implements Comparator<Wakelock>
-	{
-		public int compare(Wakelock a, Wakelock b)
-		{
-			return ((int)(b.getCount() - a.getCount()));
-		}
-	}
-	
-	public static class WakelockTimeComparator implements Comparator<Wakelock>
-	{
-		public int compare(Wakelock a, Wakelock b)
-		{
-			return ((int)(b.getDuration() - a.getDuration()));
-		}
-	}
-	
-	public Drawable getIcon(Context ctx)
-	{
-		if (m_icon == null)
-		{
-			// retrieve and store the icon for that package
-			if (m_uidInfo != null)
-			{
-				String myPackage = m_uidInfo.getNamePackage();
-				if (!myPackage.equals(""))
-				{
-					PackageManager manager = ctx.getPackageManager();
-					try
-					{
-						m_icon = manager.getApplicationIcon(myPackage);
-					}
-					catch (Exception e)
-					{
-						// nop: no icon found
-						m_icon = null;
-					}
-					
-				}
-			}
-		}
-		return m_icon;
-	}
-	
-	public String getPackageName()
-	{
-		if (m_uidInfo != null)
-		{
-			return m_uidInfo.getNamePackage();
-		}
-		else
-		{
-			return "";
-		}
-	}
+    public int compareTo(Wakelock o) {
+        // we want to sort in descending order
+        return ((int) (o.getDuration() - this.getDuration()));
+    }
+
+    /**
+     * returns a string representation of the data
+     */
+    public String getData() {
+        return this.formatDuration(getDuration())
+                + " (" + getDuration() / 1000 + " s)"
+                + " Count:" + getCount()
+                + " " + this.formatRatio(getDuration(), getTotal());
+    }
+
+    /**
+     * returns the values of the data
+     */
+    public double[] getValues() {
+        double[] retVal = new double[2];
+        retVal[0] = getDuration();
+        return retVal;
+    }
+
+    public static class WakelockCountComparator implements Comparator<Wakelock> {
+        public int compare(Wakelock a, Wakelock b) {
+            return ((int) (b.getCount() - a.getCount()));
+        }
+    }
+
+    public static class WakelockTimeComparator implements Comparator<Wakelock> {
+        public int compare(Wakelock a, Wakelock b) {
+            return ((int) (b.getDuration() - a.getDuration()));
+        }
+    }
+
+    public Drawable getIcon(Context ctx) {
+        if (m_icon == null) {
+            // retrieve and store the icon for that package
+            if (m_uidInfo != null) {
+                String myPackage = m_uidInfo.getNamePackage();
+                if (!myPackage.equals("")) {
+                    PackageManager manager = ctx.getPackageManager();
+                    try {
+                        m_icon = manager.getApplicationIcon(myPackage);
+                    } catch (Exception e) {
+                        // nop: no icon found
+                        m_icon = null;
+                    }
 
+                }
+            }
+        }
+        return m_icon;
+    }
 
+    public String getPackageName() {
+        if (m_uidInfo != null) {
+            return m_uidInfo.getNamePackage();
+        } else {
+            return "";
+        }
+    }
 
 }
diff --git a/src/com/asksven/android/common/utils/ChargerUtil.java b/src/com/asksven/android/common/utils/ChargerUtil.java
index 1c4f965..83fb292 100644
--- a/src/com/asksven/android/common/utils/ChargerUtil.java
+++ b/src/com/asksven/android/common/utils/ChargerUtil.java
@@ -22,21 +22,20 @@
 
 /**
  * Helper to detect if charger is plugged
- * @author sven
  *
+ * @author sven
  */
-public class ChargerUtil
-{
-	/**
-	 * Returns true if the charger is currently connected
-	 * @param context
-	 * @return true if the charger is connected
-	 */
-	public static boolean isConnected(Context context)
-	{
-		// make a synchronous call
-		Intent intent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-		int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
-		return plugged == BatteryManager.BATTERY_PLUGGED_AC || plugged == BatteryManager.BATTERY_PLUGGED_USB;
-	}
+public class ChargerUtil {
+    /**
+     * Returns true if the charger is currently connected
+     *
+     * @param context application context
+     * @return true if the charger is connected
+     */
+    public static boolean isConnected(Context context) {
+        // make a synchronous call
+        Intent intent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+        return plugged == BatteryManager.BATTERY_PLUGGED_AC || plugged == BatteryManager.BATTERY_PLUGGED_USB;
+    }
 }
diff --git a/src/com/asksven/android/common/utils/DataStorage.java b/src/com/asksven/android/common/utils/DataStorage.java
index 7c2aa9a..de6ed3b 100644
--- a/src/com/asksven/android/common/utils/DataStorage.java
+++ b/src/com/asksven/android/common/utils/DataStorage.java
@@ -15,144 +15,111 @@
  */
 package com.asksven.android.common.utils;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-
 import android.content.Context;
 import android.os.Environment;
 import android.util.Log;
 
+import java.io.*;
+
 /**
  * @author sven
- *
  */
-public class DataStorage
-{
-	/**
-	 * 
-	 * The logging TAG
-	 */
-	private static final String TAG = "DataStorage";
-	
-	public static boolean isExternalStorageWritable()
-	{
-		boolean mExternalStorageAvailable = false;
-		boolean mExternalStorageWriteable = false;
-		String state = Environment.getExternalStorageState();
-
-		if (Environment.MEDIA_MOUNTED.equals(state)) {
-		    // We can read and write the media
-		    mExternalStorageAvailable = mExternalStorageWriteable = true;
-		} else if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-		    // We can only read the media
-		    mExternalStorageAvailable = true;
-		    mExternalStorageWriteable = false;
-		} else {
-		    // Something else is wrong. It may be one of many other states, but all we need
-		    //  to know is we can neither read nor write
-		    mExternalStorageAvailable = mExternalStorageWriteable = false;
-		}
-		
-		return ( mExternalStorageAvailable && mExternalStorageWriteable );
-	}
-	
-	public static void LogToFile(String fileName, StackTraceElement[] stack)
-	{
-		LogToFile(fileName, "---- Begin Callstack ----");
-		for (int i = 0; i < stack.length; i++)
-		{
-			LogToFile(fileName, stack[i].toString());
-		}
-		LogToFile(fileName, "---- End Callstack ----");
-	}
-	
-	public static void LogToFile(String fileName, String strText)
-	{
-		
-		try
-    	{		
-			// open file for writing
-			File root = Environment.getExternalStorageDirectory();
-		    if (root.canWrite())
-		    {
-		    	File dumpFile = new File(root, fileName);
-		    	// append
-		        FileWriter fw = new FileWriter(dumpFile, true);
-		        BufferedWriter out = new BufferedWriter(fw);
-			  
-				// write header
-		        out.write(DateUtils.now() + " " + strText + "\n");
-						
-				// close file
-				out.close();
-		    }
-    	}
-    	catch (Exception e)
-    	{
-    		Log.e(TAG, "Exception: " + e.getMessage());
-    	}		
-	}
-	
-	public static boolean objectToFile(Context context, String fileName, Object serializableObject)
-	{
-		boolean bRet = true;
-		
-		 if (!(serializableObject instanceof java.io.Serializable))
-		 {
-			 Log.e(TAG, "The object is not serializable: " + fileName);
-		     return false;
-		 }
-		try
-		{
-			FileOutputStream fos = context.openFileOutput(fileName, Context.MODE_PRIVATE);
-			ObjectOutputStream os = new ObjectOutputStream(fos);
-			os.writeObject(serializableObject);
-			os.close();
-		}
-		catch (Exception e)
-		{
-			 Log.e(TAG, "An error occured while writing " + fileName + " " + e.getMessage());
-
-			bRet = false;
-		}
-
-		return bRet;
-	}
-	
-	public static Object fileToObject(Context context, String fileName)
-	{
-		FileInputStream fis;
-		Object myRet = null;
-		try
-		{
-			fis = context.openFileInput(fileName);
-			ObjectInputStream is = new ObjectInputStream(fis);
-			myRet = is.readObject();
-			is.close();
-
-		}
-		catch (FileNotFoundException e)
-		{
-			myRet = null;
-		}
-		catch (IOException e)
-		{
-			myRet = null;
-		}
-		catch (ClassNotFoundException e)
-		{
-			myRet = null;
-		}
-
-		return myRet;
-	}
-	
+public class DataStorage {
+    /**
+     * The logging TAG
+     */
+    private static final String TAG = "DataStorage";
+
+    public static boolean isExternalStorageWritable() {
+        boolean mExternalStorageAvailable = false;
+        boolean mExternalStorageWriteable = false;
+        String state = Environment.getExternalStorageState();
+
+        if (Environment.MEDIA_MOUNTED.equals(state)) {
+            // We can read and write the media
+            mExternalStorageAvailable = mExternalStorageWriteable = true;
+        } else if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
+            // We can only read the media
+            mExternalStorageAvailable = true;
+            mExternalStorageWriteable = false;
+        } else {
+            // Something else is wrong. It may be one of many other states, but all we need
+            //  to know is we can neither read nor write
+            mExternalStorageAvailable = mExternalStorageWriteable = false;
+        }
+
+        return (mExternalStorageAvailable && mExternalStorageWriteable);
+    }
+
+    public static void LogToFile(String fileName, StackTraceElement[] stack) {
+        LogToFile(fileName, "---- Begin Callstack ----");
+        for (StackTraceElement aStack : stack) {
+            LogToFile(fileName, aStack.toString());
+        }
+        LogToFile(fileName, "---- End Callstack ----");
+    }
+
+    public static void LogToFile(String fileName, String strText) {
+
+        try {
+            // open file for writing
+            File root = Environment.getExternalStorageDirectory();
+            if (root.canWrite()) {
+                File dumpFile = new File(root, fileName);
+                // append
+                FileWriter fw = new FileWriter(dumpFile, true);
+                BufferedWriter out = new BufferedWriter(fw);
+
+                // write header
+                out.write(DateUtils.now() + " " + strText + "\n");
+
+                // close file
+                out.close();
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Exception: " + e.getMessage());
+        }
+    }
+
+    public static boolean objectToFile(Context context, String fileName, Object serializableObject) {
+        boolean bRet = true;
+
+        if (!(serializableObject instanceof java.io.Serializable)) {
+            Log.e(TAG, "The object is not serializable: " + fileName);
+            return false;
+        }
+        try {
+            FileOutputStream fos = context.openFileOutput(fileName, Context.MODE_PRIVATE);
+            ObjectOutputStream os = new ObjectOutputStream(fos);
+            os.writeObject(serializableObject);
+            os.close();
+        } catch (Exception e) {
+            Log.e(TAG, "An error occured while writing " + fileName + " " + e.getMessage());
+
+            bRet = false;
+        }
+
+        return bRet;
+    }
+
+    public static Object fileToObject(Context context, String fileName) {
+        FileInputStream fis;
+        Object myRet = null;
+        try {
+            fis = context.openFileInput(fileName);
+            ObjectInputStream is = new ObjectInputStream(fis);
+            myRet = is.readObject();
+            is.close();
+
+        } catch (FileNotFoundException e) {
+            myRet = null;
+        } catch (IOException e) {
+            myRet = null;
+        } catch (ClassNotFoundException e) {
+            myRet = null;
+        }
+
+        return myRet;
+    }
+
 }
diff --git a/src/com/asksven/android/common/utils/DateUtils.java b/src/com/asksven/android/common/utils/DateUtils.java
index e5a1693..1eec9d9 100644
--- a/src/com/asksven/android/common/utils/DateUtils.java
+++ b/src/com/asksven/android/common/utils/DateUtils.java
@@ -19,93 +19,87 @@
  * @author sven
  *
  */
+
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.text.SimpleDateFormat;
 
-public class DateUtils
-{
-	public static final String DATE_FORMAT_NOW = "yyyy-MM-dd HH:mm:ss";
-	public static final String DATE_FORMAT_SHORT = "HH:mm:ss";
-
-	/**
-	 * Returns the current date in the default format.
-	 * @return the current formatted date/time
-	 */
-	public static String now()
-	{
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
-		return sdf.format(cal.getTime());
-	}
-	
-	/**
-	 * Returns the current date in a given format.
-	 * DateUtils.now("dd MMMMM yyyy")
+public class DateUtils {
+    public static final String DATE_FORMAT_NOW = "yyyy-MM-dd HH:mm:ss";
+    public static final String DATE_FORMAT_SHORT = "HH:mm:ss";
+
+    /**
+     * Returns the current date in the default format.
+     *
+     * @return the current formatted date/time
+     */
+    public static String now() {
+        Calendar cal = Calendar.getInstance();
+        SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
+        return sdf.format(cal.getTime());
+    }
+
+    /**
+     * Returns the current date in a given format.
+     * DateUtils.now("dd MMMMM yyyy")
      * DateUtils.now("yyyyMMdd")
      * DateUtils.now("dd.MM.yy")
      * DateUtils.now("MM/dd/yy")
-	 * @param dateFormat a date format (See examples)
-	 * @return the current formatted date/time
-	 */
-	public static String now(String dateFormat)
-	{
-		Calendar cal = Calendar.getInstance();
-		SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
-		return sdf.format(cal.getTime());
-	}
-	
-	public static String format(String dateFormat, Date time)
-	{
-
-		SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
-		return sdf.format(time);
-	}
-
-	public static String format(String dateFormat, Long time)
-	{
-
-		SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
-		return sdf.format(time);
-	}
-
-	public static String format(Date time)
-	{
-		SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
-		return sdf.format(time);
-	}
-
-	public static String format(long timeMs)
-	{
-		return format(timeMs, DATE_FORMAT_NOW);
-	}
-
-	public static String formatShort(long timeMs)
-	{
-		return format(timeMs, DATE_FORMAT_SHORT);
-	}
-
-	public static String format(long timeMs, String format)
-	{
-		SimpleDateFormat sdf = new SimpleDateFormat(format);
-		return sdf.format(timeMs);
-	}
-
-	/**
-	 * Formats milliseconds to a friendly form 
-	 * @param millis
-	 * @return the formated string
-	 */
-	public static String formatDuration(long millis)
-	{
-		String ret = "";
-		
+     *
+     * @param dateFormat a date format (See examples)
+     * @return the current formatted date/time
+     */
+    public static String now(String dateFormat) {
+        Calendar cal = Calendar.getInstance();
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        return sdf.format(cal.getTime());
+    }
+
+    public static String format(String dateFormat, Date time) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        return sdf.format(time);
+    }
+
+    public static String format(String dateFormat, Long time) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        return sdf.format(time);
+    }
+
+    public static String format(Date time) {
+        SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
+        return sdf.format(time);
+    }
+
+    public static String format(long timeMs) {
+        return format(timeMs, DATE_FORMAT_NOW);
+    }
+
+    public static String formatShort(long timeMs) {
+        return format(timeMs, DATE_FORMAT_SHORT);
+    }
+
+    public static String format(long timeMs, String format) {
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        return sdf.format(timeMs);
+    }
+
+    /**
+     * Formats milliseconds to a friendly form
+     *
+     * @param millis milliseconds to format
+     * @return the formatted string
+     */
+    public static String formatDuration(long millis) {
+        String ret = "";
+
         int seconds = (int) Math.floor(millis / 1000);
-        
+
         int days = 0, hours = 0, minutes = 0;
-        if (seconds > (60*60*24)) {
-            days = seconds / (60*60*24);
-            seconds -= days * (60*60*24);
+        if (seconds > (60 * 60 * 24)) {
+            days = seconds / (60 * 60 * 24);
+            seconds -= days * (60 * 60 * 24);
         }
         if (seconds > (60 * 60)) {
             hours = seconds / (60 * 60);
@@ -116,47 +110,42 @@ public static String formatDuration(long millis)
             seconds -= minutes * 60;
         }
         ret = "";
-        if (days > 0)
-        {
+        if (days > 0) {
             ret += days + " d ";
         }
-        
-        if (hours > 0)
-        {
-        	ret += hours + " h ";
+
+        if (hours > 0) {
+            ret += hours + " h ";
         }
-        
-        if (minutes > 0)
-        { 
-        	ret += minutes + " m ";
+
+        if (minutes > 0) {
+            ret += minutes + " m ";
         }
-        if (seconds > 0)
-        {
-        	ret += seconds + " s ";
+        if (seconds > 0) {
+            ret += seconds + " s ";
         }
-        
-        if (ret.equals(""))
-        {
-        	ret = "0 s";
+
+        if (ret.equals("")) {
+            ret = "0 s";
         }
         return ret;
-	}
-	
-	/**
-	 * Formats milliseconds to a friendly form. Short means that seconds are truncated if value > 1 Day 
-	 * @param millis
-	 * @return the formated string
-	 */
-	public static String formatDurationShort(long millis)
-	{
-		String ret = "";
-		
+    }
+
+    /**
+     * Formats milliseconds to a friendly form. Short means that seconds are truncated if value > 1 Day
+     *
+     * @param millis millis milliseconds to format
+     * @return the formatted string
+     */
+    public static String formatDurationShort(long millis) {
+        String ret = "";
+
         int seconds = (int) Math.floor(millis / 1000);
-        
+
         int days = 0, hours = 0, minutes = 0;
-        if (seconds > (60*60*24)) {
-            days = seconds / (60*60*24);
-            seconds -= days * (60*60*24);
+        if (seconds > (60 * 60 * 24)) {
+            days = seconds / (60 * 60 * 24);
+            seconds -= days * (60 * 60 * 24);
         }
         if (seconds > (60 * 60)) {
             hours = seconds / (60 * 60);
@@ -167,31 +156,26 @@ public static String formatDurationShort(long millis)
             seconds -= minutes * 60;
         }
         ret = "";
-        if (days > 0)
-        {
+        if (days > 0) {
             ret += days + " d ";
         }
-        
-        if (hours > 0)
-        {
-        	ret += hours + " h ";
+
+        if (hours > 0) {
+            ret += hours + " h ";
         }
-        
-        if (minutes > 0)
-        { 
-        	ret += minutes + " m ";
+
+        if (minutes > 0) {
+            ret += minutes + " m ";
         }
-        if ( (seconds > 0) && (days == 0) )
-        {
-        	// only show seconds when value < 1 day
-        	ret += seconds + " s ";
+        if ((seconds > 0) && (days == 0)) {
+            // only show seconds when value < 1 day
+            ret += seconds + " s ";
         }
-        
-        if (ret.equals(""))
-        {
-        	ret = "0 s";
+
+        if (ret.equals("")) {
+            ret = "0 s";
         }
         return ret;
-	}
+    }
 
 }
\ No newline at end of file
diff --git a/src/com/asksven/android/common/utils/GenericLogger.java b/src/com/asksven/android/common/utils/GenericLogger.java
index 0fb12ba..a035fb6 100644
--- a/src/com/asksven/android/common/utils/GenericLogger.java
+++ b/src/com/asksven/android/common/utils/GenericLogger.java
@@ -1,61 +1,48 @@
 /**
- * 
+ *
  */
 package com.asksven.android.common.utils;
 
 import android.util.Log;
 
-import com.asksven.android.common.utils.DataStorage;
-
 /**
  * @author sven
- *
  */
-public abstract class GenericLogger
-{
-
-	
-	
-	public static void d(String strLogfile, String strTag, String strMessage)
-	{
-		Log.d(strTag, strMessage);
-		DataStorage.LogToFile(strLogfile, strMessage);
-	}
-	
-	public static void e(String strLogfile, String strTag, String strMessage)
-	{
-		Log.e(strTag, strMessage);
-		DataStorage.LogToFile(strLogfile, strMessage);
-	}
-
-	public static void i(String strLogFile, String strTag, String strMessage)
-	{
-		Log.i(strTag, strMessage);
-		DataStorage.LogToFile(strLogFile, strMessage);
-	}
-
-	public static void e(String strLogFile, String strTag, StackTraceElement[] stack)
-	{
-		Log.e(strTag, "An Exception occured. Stacktrace:");
-		for (int i=0; i < stack.length; i++)
-		{
-			Log.e(strTag, stack[i].toString());
-		}
-		DataStorage.LogToFile(strLogFile, stack);
-	}
-	
-	public static void stackTrace(String strTag, StackTraceElement[] stack)
-	{
-		Log.e(strTag, "An Exception occured. Stacktrace:");
-		for (int i=0; i < stack.length; i++)
-		{
-			Log.e(strTag, ">>> " + stack[i].toString());
-		}
-	}
-
-	private static void writeLog(String strLogFile, String strTag, String strMessage)
-	{
-		DataStorage.LogToFile(strLogFile, strMessage);
-	}
-	
+public abstract class GenericLogger {
+
+
+    public static void d(String strLogfile, String strTag, String strMessage) {
+        Log.d(strTag, strMessage);
+        DataStorage.LogToFile(strLogfile, strMessage);
+    }
+
+    public static void e(String strLogfile, String strTag, String strMessage) {
+        Log.e(strTag, strMessage);
+        DataStorage.LogToFile(strLogfile, strMessage);
+    }
+
+    public static void i(String strLogFile, String strTag, String strMessage) {
+        Log.i(strTag, strMessage);
+        DataStorage.LogToFile(strLogFile, strMessage);
+    }
+
+    public static void e(String strLogFile, String strTag, StackTraceElement[] stack) {
+        Log.e(strTag, "An Exception occured. Stacktrace:");
+        for (StackTraceElement aStack : stack) {
+            Log.e(strTag, aStack.toString());
+        }
+        DataStorage.LogToFile(strLogFile, stack);
+    }
+
+    public static void stackTrace(String strTag, StackTraceElement[] stack) {
+        Log.e(strTag, "An Exception occured. Stacktrace:");
+        for (StackTraceElement aStack : stack) {
+            Log.e(strTag, ">>> " + aStack.toString());
+        }
+    }
+
+    private static void writeLog(String strLogFile, String strTag, String strMessage) {
+        DataStorage.LogToFile(strLogFile, strMessage);
+    }
+
 }
diff --git a/src/com/asksven/android/common/utils/StringUtils.java b/src/com/asksven/android/common/utils/StringUtils.java
index fe2482a..c08788d 100644
--- a/src/com/asksven/android/common/utils/StringUtils.java
+++ b/src/com/asksven/android/common/utils/StringUtils.java
@@ -23,98 +23,76 @@
 
 /**
  * @author sven
- *
  */
-public class StringUtils
-{
-	public static final String formatRatio(long num, long den)
-	{
-		StringBuilder mFormatBuilder = new StringBuilder(8);
-	    Formatter mFormatter = new Formatter(mFormatBuilder);
-        if (den == 0L)
-        {
+public class StringUtils {
+    public static String formatRatio(long num, long den) {
+        StringBuilder mFormatBuilder = new StringBuilder(8);
+        Formatter mFormatter = new Formatter(mFormatBuilder);
+        if (den == 0L) {
             return "---%";
         }
-        
-        float perc = ((float)num) / ((float)den) * 100;
+
+        float perc = ((float) num) / ((float) den) * 100;
         mFormatBuilder.setLength(0);
         mFormatter.format("%.1f%%", perc);
         return mFormatBuilder.toString();
     }
-	
-	public static String join(String[] array, String sep, boolean merge)
-	{
-		String ret = "";
-		for (int i = 0; i < array.length; i++)
-		{
-			if (ret.equals(""))
-			{
-				ret = array[i];
-			}
-			else
-			{
-				if (merge)
-				{
-					// check if the string is alread present
-					if (ret.indexOf(array[i]) == -1)
-					{
-						// add
-						ret += sep + array[i];
-					}
-				}
-				else
-				{
-					ret += sep + array[i];
-				}
-			}
-		}
-		return ret;
-	}
-	
-	public static void splitLine(String line, ArrayList<String> outSplit)
-	{
-		outSplit.clear();
-		final StringTokenizer t = new StringTokenizer(line, " \t\n\r\f:");
-		while (t.hasMoreTokens())
-		{
-			outSplit.add(t.nextToken());
-		}
-	}	
-	
-	public static void parseLine(ArrayList<String> keys, ArrayList<String> values, HashMap<String, String> outParsed)
-	{
-		outParsed.clear();
-		final int size = Math.min(keys.size(), values.size());
-		for (int i = 0; i < size; i++)
-		{
-			outParsed.put(keys.get(i), values.get(i));
-		}
-	}
-	
-	public static int getParsedInt(HashMap<String, String> parsed, String key)
-	{
-		final String value = parsed.get(key);
-		return value != null ? Integer.parseInt(value) : 0;
-	}
-	
-	public static long getParsedLong(HashMap<String, String> parsed, String key)
-	{
-		final String value = parsed.get(key);
-		return value != null ? Long.parseLong(value) : 0;
-	}
 
-	public static String stripLeadingAndTrailingQuotes(String str)
-	  {
-	      if (str.startsWith("\""))
-	      {
-	          str = str.substring(1, str.length());
-	      }
-	      if (str.endsWith("\""))
-	      {
-	          str = str.substring(0, str.length() - 1);
-	      }
-	      return str;
-	  }
+    public static String join(String[] array, String sep, boolean merge) {
+        String ret = "";
+        for (String anArray : array) {
+            if (ret.equals("")) {
+                ret = anArray;
+            } else {
+                if (merge) {
+                    // check if the string is alread present
+                    if (!ret.contains(anArray)) {
+                        // add
+                        ret += sep + anArray;
+                    }
+                } else {
+                    ret += sep + anArray;
+                }
+            }
+        }
+        return ret;
+    }
+
+    public static void splitLine(String line, ArrayList<String> outSplit) {
+        outSplit.clear();
+        final StringTokenizer t = new StringTokenizer(line, " \t\n\r\f:");
+        while (t.hasMoreTokens()) {
+            outSplit.add(t.nextToken());
+        }
+    }
+
+    public static void parseLine(ArrayList<String> keys, ArrayList<String> values, HashMap<String, String> outParsed) {
+        outParsed.clear();
+        final int size = Math.min(keys.size(), values.size());
+        for (int i = 0; i < size; i++) {
+            outParsed.put(keys.get(i), values.get(i));
+        }
+    }
+
+    public static int getParsedInt(HashMap<String, String> parsed, String key) {
+        final String value = parsed.get(key);
+        return value != null ? Integer.parseInt(value) : 0;
+    }
+
+    public static long getParsedLong(HashMap<String, String> parsed, String key) {
+        final String value = parsed.get(key);
+        return value != null ? Long.parseLong(value) : 0;
+    }
+
+    public static String stripLeadingAndTrailingQuotes(String str) {
+        if (str.startsWith("\"")) {
+            str = str.substring(1, str.length());
+        }
+        if (str.endsWith("\"")) {
+            str = str.substring(0, str.length() - 1);
+        }
+        return str;
+    }
 
 
 }
diff --git a/src/com/asksven/android/system/Installation.java b/src/com/asksven/android/system/Installation.java
index 5f6e9fb..a33438d 100644
--- a/src/com/asksven/android/system/Installation.java
+++ b/src/com/asksven/android/system/Installation.java
@@ -24,47 +24,35 @@
 
 /**
  * @author sven
- * 
  */
-public class Installation
-{
-	public static boolean isInstalledOnSdCard(Context context)
-	{
+public class Installation {
+    public static boolean isInstalledOnSdCard(Context context) {
 
-		// check for API level 8 and higher
-		if (VERSION.SDK_INT > android.os.Build.VERSION_CODES.ECLAIR_MR1)
-		{
-			PackageManager pm = context.getPackageManager();
-			try
-			{
-				PackageInfo pi = pm.getPackageInfo(context.getPackageName(), 0);
-				ApplicationInfo ai = pi.applicationInfo;
-				return (ai.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) == ApplicationInfo.FLAG_EXTERNAL_STORAGE;
-			}
-			catch (NameNotFoundException e)
-			{
-				// ignore
-			}
-		}
+        // check for API level 8 and higher
+        if (VERSION.SDK_INT > 7) {
+            PackageManager pm = context.getPackageManager();
+            try {
+                PackageInfo pi = pm.getPackageInfo(context.getPackageName(), 0);
+                ApplicationInfo ai = pi.applicationInfo;
+                return (ai.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) == ApplicationInfo.FLAG_EXTERNAL_STORAGE;
+            } catch (NameNotFoundException e) {
+                // ignore
+            }
+        }
 
-		// check for API level 7 - check files dir
-		try
-		{
-			String filesDir = context.getFilesDir().getAbsolutePath();
-			if (filesDir.startsWith("/data/"))
-			{
-				return false;
-			} else if (filesDir.contains("/mnt/")
-					|| filesDir.contains("/sdcard/"))
-			{
-				return true;
-			}
-		}
-		catch (Throwable e)
-		{
-			// ignore
-		}
+        // check for API level 7 - check files dir
+        try {
+            String filesDir = context.getFilesDir().getAbsolutePath();
+            if (filesDir.startsWith("/data/")) {
+                return false;
+            } else if (filesDir.contains("/mnt/")
+                    || filesDir.contains("/sdcard/")) {
+                return true;
+            }
+        } catch (Throwable e) {
+            // ignore
+        }
 
-		return false;
-	}
+        return false;
+    }
 }