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

Commit 5012cef5 authored by lesl's avatar lesl Committed by Les Lee
Browse files

wifi: Use new API for data usage function 

For mobile, a old API: buildTemplateMobileAll doesn't includes the
merged wifi network, call the new API: buildTemplateCarrierMetered
to replace the old one.

PS: Not only usage functionality but also apply to network policy
control since the default policy is changing to use
new API: buildTemplateCarrier now.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageLibTest
Test: Manual Test, modify the mobile usage warming and limit bytes and
      check the data via adb shell dumpsys netpolicy

Bug: 176396812
Merged-In: I6fbec14e7be4dc4b5c2fd3659a801521c81b233c
Change-Id: I6fbec14e7be4dc4b5c2fd3659a801521c81b233c
parent 3940e529

src/com/android/settings/SettingsDumpService.java

+2 −2
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ public class SettingsDumpService extends Service { 
            for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {

                telephonyManager = telephonyManager

                        .createForSubscriptionId(info.getSubscriptionId());

                NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(

                NetworkTemplate carrier = NetworkTemplate.buildTemplateCarrierMetered(

                        telephonyManager.getSubscriberId());

                final JSONObject usage = dumpDataUsage(mobileAll, controller);

                final JSONObject usage = dumpDataUsage(carrier, controller);

                usage.put("subId", info.getSubscriptionId());

                array.put(usage);

            }

src/com/android/settings/datausage/lib/DataUsageLib.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class DataUsageLib { 


    private static NetworkTemplate getMobileTemplateForSubId(

            TelephonyManager telephonyManager, int subId) {

        return NetworkTemplate.buildTemplateMobileAll(

        return NetworkTemplate.buildTemplateCarrierMetered(

                telephonyManager.getSubscriberId(subId));

    }

}