PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Choose correct network template for data history" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-05-08 18:13:13 +00:00
committed by Android (Google) Code Review
parent 4d1efa0e6d 10e1a94ef7
commit 9e1ea4b121
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -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());
}