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

Use NetworkTemplate to query data

Browse Source 
So virtual carrier can get correct data with merged subscriberIds

Bug: 120566366
Test: RunSettingsLibRoboTests
Change-Id: I02abed77dffb55ef49fe0c4142f6f5b4a42ebe52
This commit is contained in:
Lei Yu
2019-05-09 15:12:59 -07:00
parent 12dcbe7c71
commit 22a9f539e9
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
View File

@@ -92,7 +92,6 @@ public class AppDataUsagePreferenceController extends AppInfoPreferenceControlle
.addUid(mParent.getAppEntry().info.uid) .addUid(mParent.getAppEntry().info.uid)
.setRetrieveDetail(false) .setRetrieveDetail(false)
.setNetworkTemplate(template) .setNetworkTemplate(template)
.setSubscriberId(template.getSubscriberId())
.build(); .build();
} }

3
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -393,8 +393,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
final NetworkCycleDataForUidLoader.Builder builder final NetworkCycleDataForUidLoader.Builder builder
= NetworkCycleDataForUidLoader.builder(mContext); = NetworkCycleDataForUidLoader.builder(mContext);
builder.setRetrieveDetail(true) builder.setRetrieveDetail(true)
.setNetworkTemplate(mTemplate) .setNetworkTemplate(mTemplate);
.setSubscriberId(mTemplate.getSubscriberId());
if (mAppItem.category == AppItem.CATEGORY_USER) { if (mAppItem.category == AppItem.CATEGORY_USER) {
for (int i = 0; i < mAppItem.uids.size(); i++) { for (int i = 0; i < mAppItem.uids.size(); i++) {
builder.addUid(mAppItem.uids.keyAt(i)); builder.addUid(mAppItem.uids.keyAt(i));

4
src/com/android/settings/datausage/DataUsageList.java
View File

@@ -496,7 +496,6 @@ public class DataUsageList extends DataUsageBaseFragment {
public Loader<List<NetworkCycleChartData>> onCreateLoader(int id, Bundle args) { public Loader<List<NetworkCycleChartData>> onCreateLoader(int id, Bundle args) {
return NetworkCycleChartDataLoader.builder(getContext()) return NetworkCycleChartDataLoader.builder(getContext())
.setNetworkTemplate(mTemplate) .setNetworkTemplate(mTemplate)
.setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))
.build(); .build();
} }
@@ -523,8 +522,7 @@ public class DataUsageList extends DataUsageBaseFragment {
return new NetworkStatsSummaryLoader.Builder(getContext()) return new NetworkStatsSummaryLoader.Builder(getContext())
.setStartTime(mChart.getInspectStart()) .setStartTime(mChart.getInspectStart())
.setEndTime(mChart.getInspectEnd()) .setEndTime(mChart.getInspectEnd())
.setNetworkType(mNetworkType) .setNetworkTemplate(mTemplate)
.setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))
.build(); .build();
} }