From 10e1a94ef7bf7034e0e9bebe471c868abb3825a9 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Fri, 8 May 2015 11:24:03 -0400
Subject: [PATCH] Choose correct network template for data history

Bug: 19921796
Change-Id: I90376ed0314c47fcbee21c81b85f60d3cc3312a6
---
 .../settings/applications/InstalledAppDetails.java   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index a6fee90a9dc..73e7b8dd428 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -246,7 +246,7 @@ public class InstalledAppDetails extends AppInfoBase
         AppItem app = new AppItem(mAppEntry.info.uid);
         app.addUid(mAppEntry.info.uid);
         getLoaderManager().restartLoader(LOADER_CHART_DATA,
-                ChartDataLoader.buildArgs(NetworkTemplate.buildTemplateMobileWildcard(), app),
+                ChartDataLoader.buildArgs(getTemplate(getContext()), app),
                 mDataCallbacks);
         new BatteryUpdater().execute();
     }
@@ -698,6 +698,16 @@ public class InstalledAppDetails extends AppInfoBase
         return true;
     }
 
+    private static NetworkTemplate getTemplate(Context context) {
+        if (DataUsageSummary.hasReadyMobileRadio(context)) {
+            return NetworkTemplate.buildTemplateMobileWildcard();
+        }
+        if (DataUsageSummary.hasWifiRadio(context)) {
+            return NetworkTemplate.buildTemplateWifiWildcard();
+        }
+        return NetworkTemplate.buildTemplateEthernet();
+    }
+
     public static CharSequence getNotificationSummary(AppEntry appEntry, Context context) {
         return getNotificationSummary(appEntry, context, new NotificationBackend());
     }