LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field"

Browse Source
This commit is contained in:
Frank Li
2022-03-02 12:26:11 +00:00
committed by Gerrit Code Review
parent 350414997d 7c9fde88d6
commit 9de9a8b2de
4 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
service-t/src/com/android/server/net/NetworkStatsService.java
View File

@@ -1540,10 +1540,15 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
NetworkCapabilities.NET_CAPABILITY_IMS) && !ident.isMetered()) {
// Copy the identify from IMS one but mark it as metered.
NetworkIdentity vtIdent = new NetworkIdentity(ident.getType(),
ident.getRatType(), ident.getSubscriberId(), ident.getWifiNetworkKey(),
ident.isRoaming(), true /* metered */,
true /* onDefaultNetwork */, ident.getOemManaged());
NetworkIdentity vtIdent = new NetworkIdentity.Builder()
.setType(ident.getType())
.setRatType(ident.getRatType())
.setSubscriberId(ident.getSubscriberId())
.setWifiNetworkKey(ident.getWifiNetworkKey())
.setRoaming(ident.isRoaming()).setMetered(true)
.setDefaultNetwork(true)
.setOemManaged(ident.getOemManaged())
.setSubId(ident.getSubId()).build();
final String ifaceVt = IFACE_VT + getSubIdForMobile(snapshot);
findOrCreateNetworkIdentitySet(mActiveIfaces, ifaceVt).add(vtIdent);
findOrCreateNetworkIdentitySet(mActiveUidIfaces, ifaceVt).add(vtIdent);