commit | f004bcbbf59c7cc6fd577f5fab5f87fde7ee00d3 | [log] [tgz] |
---|---|---|
author | Varun Anand <vaanand@google.com> | Fri Mar 29 00:40:53 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 29 00:40:53 2019 +0000 |
tree | 193e99c1da73d267fded35046e9b212fe7b72f9d | |
parent | b3aaa9e9023ecb76d2cddd70c99fff5f576fb1e2 [diff] | |
parent | 23e1e5e300645ed2f84aa42f530ddf68165f0f1b [diff] |
Merge changes from topic "vpn_data_accounting" * changes: Move BatteryStats and StatsCompanionService to use NetworkStatsService. NetworkStatsService: Fix getDetailedUidStats to take VPNs into account. Take all VPN underlying networks into account when migrating traffic for VPN uid.