Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: Use new API for wifi data usage function" am: f437848713 am: d9592852bc

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

Change-Id: Id21dc0056bf573799ade2445ab940b27fc1013a3
This commit is contained in:
Les Lee
2021-05-06 05:35:46 +00:00
committed by Automerger Merge Worker
parent 88d6f01bae d9592852bc
commit b9c68bbf38
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
View File

@@ -113,7 +113,8 @@ public class DataUsageController {
} }
public DataUsageInfo getWifiDataUsageInfo() { public DataUsageInfo getWifiDataUsageInfo() {
NetworkTemplate template = NetworkTemplate.buildTemplateWifiWildcard(); NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
NetworkTemplate.WIFI_NETWORKID_ALL, null);
return getDataUsageInfo(template); return getDataUsageInfo(template);
} }

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

@@ -89,7 +89,8 @@ public class DataUsageControllerTest {
mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID); mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID);
mNetworkTemplate2 = NetworkTemplate.buildTemplateMobileAll(SUB_ID_2); mNetworkTemplate2 = NetworkTemplate.buildTemplateMobileAll(SUB_ID_2);
mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifiWildcard(); mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifi(
NetworkTemplate.WIFI_NETWORKID_ALL, null);
} }
@Test @Test