Merge "Choose correct network template for data history" into mnc-dev (9e1ea4b1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/InstalledAppDetails.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -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);
		if (mPackageInfo != null) {
		new BatteryUpdater().execute();
		@@ -700,6 +700,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());
		}