diff --git a/src/com/android/settings/DataUsageAppDetail.java b/src/com/android/settings/DataUsageAppDetail.java
index a683561..6294ad3 100644
--- a/src/com/android/settings/DataUsageAppDetail.java
+++ b/src/com/android/settings/DataUsageAppDetail.java
@@ -32,6 +32,7 @@
 import android.net.INetworkPolicyManager;
 import android.net.INetworkStatsService;
 import android.net.NetworkPolicyManager;
+import android.net.NetworkStats;
 import android.net.NetworkStatsHistory;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
@@ -162,7 +163,7 @@
         try {
             // load stats for current uid and template
             // TODO: read template from extras
-            mHistory = mStatsService.getHistoryForUid(mTemplate, mUid);
+            mHistory = mStatsService.getHistoryForUid(mTemplate, mUid, NetworkStats.TAG_NONE);
         } catch (RemoteException e) {
             // since we can't do much without history, and we don't want to
             // leave with half-baked UI, we bail hard.
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 83dd78e..79d0baf 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -598,7 +598,7 @@
             protected NetworkStats doInBackground(Void... params) {
                 try {
                     final long[] range = mChart.getInspectRange();
-                    return mStatsService.getSummaryForAllUid(mTemplate, range[0], range[1]);
+                    return mStatsService.getSummaryForAllUid(mTemplate, range[0], range[1], false);
                 } catch (RemoteException e) {
                     Log.w(TAG, "problem reading stats");
                 }
