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

Populate OemManagedBytesTransfer without metered

Browse Source 
Slice OemManagedBytesTransfer by uid + fg/bg status, and not by
meteredness. The atom does not have a metered or tag field, so there is
no reason to slice by metered or tag.

Populate the transport field of OemManagedBytesTransfer with
NetworkCapabilities.TRANSPORT_<type> instead of using NetworkTemplate
match rules.

Bug: 201979463
Test: Verify output of statsd_testdrive 10100 and adb shell dumpsys
netstats --uid are correct and consistent

Change-Id: I9178893e36eca1bae8df0063ee35680f7af20944
This commit is contained in:
Chris Weir
2021-10-20 11:23:33 -07:00
parent 451d8a60b6
commit f0e91fc495
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -24,6 +24,7 @@ import static android.app.usage.NetworkStatsManager.FLAG_POLL_ON_OPEN;
import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED;
import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkIdentity.OEM_PAID;
import static android.net.NetworkIdentity.OEM_PRIVATE;
@@ -157,6 +158,7 @@ import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
import android.util.Pair;
import android.util.Slog;
import android.util.SparseArray;
import android.util.StatsEvent;
@@ -1315,25 +1317,30 @@ public class StatsPullAtomService extends SystemService {
}
@NonNull private List<NetworkStatsExt> getDataUsageBytesTransferSnapshotForOemManaged() {
final int[] transports = new int[] {MATCH_ETHERNET, MATCH_MOBILE_WILDCARD,
MATCH_WIFI_WILDCARD};
final List<Pair<Integer, Integer>> matchRulesAndTransports = List.of(
new Pair(MATCH_ETHERNET, TRANSPORT_ETHERNET),
new Pair(MATCH_MOBILE_WILDCARD, TRANSPORT_CELLULAR),
new Pair(MATCH_WIFI_WILDCARD, TRANSPORT_WIFI)
);
final int[] oemManagedTypes = new int[] {OEM_PAID | OEM_PRIVATE, OEM_PAID, OEM_PRIVATE};
final List<NetworkStatsExt> ret = new ArrayList<>();
for (final int transport : transports) {
for (Pair<Integer, Integer> ruleAndTransport : matchRulesAndTransports) {
final Integer matchRule = ruleAndTransport.first;
for (final int oemManaged : oemManagedTypes) {
/* A null subscriberId will set wildcard=true, since we aren't trying to select a
specific ssid or subscriber. */
final NetworkTemplate template = new NetworkTemplate(transport,
final NetworkTemplate template = new NetworkTemplate(matchRule,
/*subscriberId=*/null, /*matchSubscriberIds=*/null, /*networkId=*/null,
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
oemManaged);
final NetworkStats stats = getUidNetworkStatsSnapshotForTemplate(template, true);
final NetworkStats stats = getUidNetworkStatsSnapshotForTemplate(template, false);
final Integer transport = ruleAndTransport.second;
if (stats != null) {
ret.add(new NetworkStatsExt(sliceNetworkStatsByUidTagAndMetered(stats),
new int[] {transport}, /*slicedByFgbg=*/true, /*slicedByTag=*/true,
/*slicedByMetered=*/true, TelephonyManager.NETWORK_TYPE_UNKNOWN,
ret.add(new NetworkStatsExt(sliceNetworkStatsByUidAndFgbg(stats),
new int[] {transport}, /*slicedByFgbg=*/true, /*slicedByTag=*/false,
/*slicedByMetered=*/false, TelephonyManager.NETWORK_TYPE_UNKNOWN,
/*subInfo=*/null, oemManaged));
}
}