| commit | 06b4b6f92e4442c10d7a24f6089e06a3231c8d5e | [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 | 5c8341840854563740604725f1858e5c590f93db [diff] | |
| parent | 2af0b66aba89a4d1eeed69823967b659628f271c [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.