| commit | 6c93e5378a754f1992aaf4bfd5d030c623dbc57b | [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 | af2795f972ca15bc53580341ec062b1bca63dd75 | |
| parent | c3b3a5fa2e780c89eafb3e43ab1747487d33f8b1 [diff] | |
| parent | 346aa87544a0d9e212dbb0dd9265a31ca609c7a4 [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.