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

Commit c0245bb9 authored by Les Lee's avatar Les Lee Committed by Gerrit Code Review
Browse files

Merge "wifi: Use new API for data usage function"

parents ca305140 74822b6d

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));

    }

}