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

wifi: Use new API for wifi data usage function

Browse Source 
For wifi, a old API: buildTemplateWifiWildcard will includes the merged
wifi which is included to mobile usage. It should not double count
again. Call new API: buildTemplateWifi with
NetworkId: NetworkTemplate.WIFI_NETWORKID_ALL
and null subscriberId to get non-merged wifi usage.

Test: atest -c DataUsageControllerTest
Test: Manual Test, wifi data usage count correctly.
Bug: 176396812
Merged-In: I047bc7dfe6a217c1a88faf3ed5c6783f33227c32
Change-Id: I047bc7dfe6a217c1a88faf3ed5c6783f33227c32
This commit is contained in:
lesl
2021-05-04 14:18:40 +08:00
parent a5786a15e1
commit fda6acc990
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() {
NetworkTemplate template = NetworkTemplate.buildTemplateWifiWildcard();
NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
NetworkTemplate.WIFI_NETWORKID_ALL, null);
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);
mNetworkTemplate2 = NetworkTemplate.buildTemplateMobileAll(SUB_ID_2);
mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifiWildcard();
mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifi(
NetworkTemplate.WIFI_NETWORKID_ALL, null);
}
@Test