diff options
| author | 2021-05-06 05:11:36 +0000 | |
|---|---|---|
| committer | 2021-05-06 05:11:36 +0000 | |
| commit | d9592852bc11fe024fe69a4309897a9f5ba7e5b3 (patch) | |
| tree | dd43d6afd417d1d29c919a9b1a7a91ab502e79e4 | |
| parent | cbf91b3e8c65b7d8f99f4942bce5a70b9a475797 (diff) | |
| parent | f437848713dc76321298118ee879801fed49463d (diff) | |
Merge "wifi: Use new API for wifi data usage function" am: f437848713
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697190
Change-Id: I9c4473021a67500b81f98012f95fcc24c45c1792
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java | 3 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java index 60bcf37304a5..18c38c5a6494 100644 --- a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java +++ b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java @@ -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); } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java index f7bee30a087f..27d877db4952 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java @@ -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 |