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

Commit b9c68bbf authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

Merge "wifi: Use new API for wifi data usage function" am: f4378487 am: d9592852 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697190

Change-Id: Id21dc0056bf573799ade2445ab940b27fc1013a3
parents 88d6f01b d9592852

packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java

+2 −1
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ public class DataUsageController { 
    }



    public DataUsageInfo getWifiDataUsageInfo() {

        NetworkTemplate template = NetworkTemplate.buildTemplateWifiWildcard();

        NetworkTemplate template = NetworkTemplate.buildTemplateWifi(

                NetworkTemplate.WIFI_NETWORKID_ALL, null);

        return getDataUsageInfo(template);

    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ public class DataUsageControllerTest { 


        mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID);

        mNetworkTemplate2 = NetworkTemplate.buildTemplateMobileAll(SUB_ID_2);

        mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifiWildcard();

        mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifi(

                NetworkTemplate.WIFI_NETWORKID_ALL, null);

    }



    @Test