1 files changed, 8 insertions, 2 deletions
diff --git a/src/org/cyanogenmod/providers/datausage/BootReceiver.java b/src/org/cyanogenmod/providers/datausage/BootReceiver.java
index 75e8e52..73e2dfb 100644
--- a/src/org/cyanogenmod/providers/datausage/BootReceiver.java
+++ b/src/org/cyanogenmod/providers/datausage/BootReceiver.java
@@ -19,14 +19,20 @@ package org.cyanogenmod.providers.datausage;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 
 public class BootReceiver extends BroadcastReceiver {
 
     private static final String TAG = BootReceiver.class.getSimpleName();
+    private static final boolean DEBUG = true;
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        DataUsageUtils.startDataUsageServiceIfEnabled(context);
+        boolean qualified = DataUsageUtils.isDataUsageQualified(context);
+
+        // start DataUsage service once the device boots up, but only if
+        // on qualified network and the service itself is enabled from the Settings->DataUsage
+        if (qualified) {
+            DataUsageUtils.startDataUsageServiceIfEnabled(context);
+        }
     }
 }