Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a9f539 authored by Lei Yu's avatar Lei Yu
Browse files

Use NetworkTemplate to query data 

So virtual carrier can get correct data with merged subscriberIds

Bug: 120566366
Test: RunSettingsLibRoboTests
Change-Id: I02abed77dffb55ef49fe0c4142f6f5b4a42ebe52
parent 12dcbe7c

src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ public class AppDataUsagePreferenceController extends AppInfoPreferenceControlle 
            .addUid(mParent.getAppEntry().info.uid)

            .setRetrieveDetail(false)

            .setNetworkTemplate(template)

            .setSubscriberId(template.getSubscriberId())

            .build();

    }

src/com/android/settings/datausage/AppDataUsage.java

+1 −2
Original line number Diff line number Diff line
@@ -393,8 +393,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
                final NetworkCycleDataForUidLoader.Builder builder

                    = NetworkCycleDataForUidLoader.builder(mContext);

                builder.setRetrieveDetail(true)

                    .setNetworkTemplate(mTemplate)

                    .setSubscriberId(mTemplate.getSubscriberId());

                    .setNetworkTemplate(mTemplate);

                if (mAppItem.category == AppItem.CATEGORY_USER) {

                    for (int i = 0; i < mAppItem.uids.size(); i++) {

                        builder.addUid(mAppItem.uids.keyAt(i));

src/com/android/settings/datausage/DataUsageList.java

+1 −3
Original line number Diff line number Diff line
@@ -496,7 +496,6 @@ public class DataUsageList extends DataUsageBaseFragment { 
        public Loader<List<NetworkCycleChartData>> onCreateLoader(int id, Bundle args) {

            return NetworkCycleChartDataLoader.builder(getContext())

                    .setNetworkTemplate(mTemplate)

                    .setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))

                    .build();

        }
@@ -523,8 +522,7 @@ public class DataUsageList extends DataUsageBaseFragment { 
            return new NetworkStatsSummaryLoader.Builder(getContext())

                    .setStartTime(mChart.getInspectStart())

                    .setEndTime(mChart.getInspectEnd())

                    .setNetworkType(mNetworkType)

                    .setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))

                    .setNetworkTemplate(mTemplate)

                    .build();

        }