commit a662e4975b5c17d91822d6bd23a96a2532c4940d
author Jeff Sharkey <jsharkey@android.com> Sat Jun 18 21:57:06 2011 -0700
committer Jeff Sharkey <jsharkey@android.com> Sat Jun 18 22:22:29 2011 -0700
tree f8475cb0e9f63931162e35d3c5e28602381ae34f
parent fd03deaef6925a4a4c7bb19c9a8cb5d1ab21e22f

NetworkTemplate refactoring for data stats.

To match framework changes.

Change-Id: I0f648ae5753149f9774c8096540834451ba41279

src/com/android/settings/DataUsageAppDetail.java

diff --git a/src/com/android/settings/DataUsageAppDetail.java b/src/com/android/settings/DataUsageAppDetail.java
index 0d15dac..a683561 100644
--- a/src/com/android/settings/DataUsageAppDetail.java
+++ b/src/com/android/settings/DataUsageAppDetail.java
@@ -18,7 +18,6 @@
 
 import static android.net.NetworkPolicyManager.POLICY_NONE;
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-import static android.net.TrafficStats.TEMPLATE_MOBILE_ALL;
 import static com.android.settings.DataUsageSummary.getHistoryBounds;
 
 import android.app.AlertDialog;
@@ -34,6 +33,7 @@
 import android.net.INetworkStatsService;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkStatsHistory;
+import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -58,7 +58,12 @@
     private static final String TAG = "DataUsage";
     private static final boolean LOGD = true;
 
+    public static final String EXTRA_UID = "uid";
+    public static final String EXTRA_NETWORK_TEMPLATE = "networkTemplate";
+
     private int mUid;
+    private NetworkTemplate mTemplate;
+
     private Intent mAppSettingsIntent;
 
     private static final String TAG_CONFIRM_RESTRICT = "confirmRestrict";
@@ -133,7 +138,9 @@
     private void updateBody() {
         final PackageManager pm = getActivity().getPackageManager();
 
-        mUid = getArguments().getInt(Intent.EXTRA_UID);
+        mUid = getArguments().getInt(EXTRA_UID);
+        mTemplate = getArguments().getParcelable(EXTRA_NETWORK_TEMPLATE);
+
         mTitle.setText(pm.getNameForUid(mUid));
 
         // enable settings button when package provides it
@@ -155,7 +162,7 @@
         try {
             // load stats for current uid and template
             // TODO: read template from extras
-            mHistory = mStatsService.getHistoryForUid(mUid, TEMPLATE_MOBILE_ALL);
+            mHistory = mStatsService.getHistoryForUid(mTemplate, mUid);
         } 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.