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

Commit 4a8a2943 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" into sc-dev am: 068cc6fe 

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

Change-Id: I3a94527cb38980798dd942c28b88dbf605d3d1d1
parents a20c2874 068cc6fe

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