Tyler Freeman
f15ef5d899
Merge "Merge "DO NOT MERGE ANYWHERE: Manually merge commit 'fd35d7c0a284' into oc-dev-plus-aosp am: 732df7fec9 -s ours" into oc-dr1-dev-plus-aosp am: 6c182d2c61 -s ours" into oc-mr1-dev-plus-aosp
...
am: d2e9f1df97 -s ours
Change-Id: I89f50ec1f15fc6c78fa033b8de5be48ab286cb72
2017-08-22 15:02:40 +00:00
Baligh Uddin
756a5719f0
Merge "DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours am: 0a92e1584e -s ours am: a174dd26d3 -s ours" into oc-mr1-dev-plus-aosp
...
am: edb499aa82
2017-08-22 14:47:58 +00:00
Baligh Uddin
3451cfca77
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours am: 0a92e1584e -s ours am: 4a46108d0f -s ours
...
am: 925023b605
2017-08-22 14:27:14 +00:00
Tyler Freeman
d793fea361
Merge "DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev am: 27b9dd89db -s ours am: 20eaf1b908 -s ours" into oc-mr1-dev-plus-aosp
...
am: 1d9e16f218
2017-08-22 14:21:18 +00:00
Tyler Freeman
144cf4eb40
DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev am: 27b9dd89db -s ours am: 9e41f13ae6 -s ours
...
am: 5930bf3296
2017-08-22 14:15:48 +00:00
Tyler Freeman
f39d498050
Merge "DO NOT MERGE ANYWHERE: Manually merge commit 'fd35d7c0a284' into oc-dev-plus-aosp am: 732df7fec9 -s ours" into oc-dr1-dev-plus-aosp
...
am: 6c182d2c61
2017-08-21 22:16:03 +00:00
Android Build Merger (Role)
edb499aa82
Merge "DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours am: 0a92e1584e -s ours am: a174dd26d3 -s ours" into oc-mr1-dev-plus-aosp
2017-08-21 22:11:17 +00:00
Baligh Uddin
925023b605
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours am: 0a92e1584e -s ours
...
am: 4a46108d0f
2017-08-21 22:06:46 +00:00
Baligh Uddin
1135272742
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours am: 0a92e1584e -s ours
...
am: a174dd26d3
2017-08-21 22:06:44 +00:00
Android Build Merger (Role)
1d9e16f218
Merge "DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev am: 27b9dd89db -s ours am: 20eaf1b908 -s ours" into oc-mr1-dev-plus-aosp
2017-08-21 22:02:54 +00:00
Android Build Merger (Role)
6c182d2c61
Merge "DO NOT MERGE ANYWHERE: Manually merge commit 'fd35d7c0a284' into oc-dev-plus-aosp am: 732df7fec9 -s ours" into oc-dr1-dev-plus-aosp
2017-08-21 22:02:00 +00:00
Tyler Freeman
2b1ce8b6ef
DO NOT MERGE ANYWHERE: Manually merge commit 'fd35d7c0a284' into oc-dev-plus-aosp
...
am: 732df7fec9
2017-08-21 21:57:57 +00:00
Tyler Freeman
2436bba07d
DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev am: 27b9dd89db -s ours
...
am: 20eaf1b908
2017-08-21 21:57:56 +00:00
Tyler Freeman
5930bf3296
DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev am: 27b9dd89db -s ours
...
am: 9e41f13ae6
2017-08-21 21:52:56 +00:00
Baligh Uddin
4a46108d0f
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours
...
am: 0a92e1584e
2017-08-21 21:52:56 +00:00
Baligh Uddin
a174dd26d3
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours
...
am: 0a92e1584e
2017-08-21 21:52:52 +00:00
Tyler Freeman
20eaf1b908
DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev
...
am: 27b9dd89db
2017-08-21 21:41:25 +00:00
Tyler Freeman
9e41f13ae6
DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev
...
am: 27b9dd89db
2017-08-21 21:41:22 +00:00
Baligh Uddin
0a92e1584e
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
...
am: e811770999
2017-08-21 21:40:53 +00:00
The Android Automerger
732df7fec9
DO NOT MERGE ANYWHERE: Manually merge commit 'fd35d7c0a284' into oc-dev-plus-aosp
...
BUG:64864568
2017-08-21 21:34:43 +00:00
The Android Automerger
27b9dd89db
DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev
...
BUG:64864568
2017-08-21 21:28:42 +00:00
Hugo Benichi
072b80a6f7
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" into oc-mr1-dev am: 39b6912019 -s ours
...
am: d283e9c344
2017-08-21 03:54:02 +00:00
Hugo Benichi
d283e9c344
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" into oc-mr1-dev
...
am: 39b6912019
2017-08-21 03:38:20 +00:00
Hugo Benichi
39b6912019
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" into oc-mr1-dev
2017-08-21 03:24:06 +00:00
Baligh Uddin
e811770999
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
...
Bug: 64864568
This reverts commit fd35d7c0a284e31231e2f424cade864be695965b, reversing
changes made to 07a21754f45672b27e765d8c7677c9663c6dce91.
2017-08-19 15:49:05 -07:00
Lorenzo Colitti
6139b1ea6d
Merge changes I325b13d5,I89719fe7 am: 06b75147b3 am: 09f500e6a4 am: ed2b08430a am: 0e2bdae581 -s ours
...
am: 8448e53e7b
2017-08-19 03:57:21 +00:00
Lorenzo Colitti
8448e53e7b
Merge changes I325b13d5,I89719fe7 am: 06b75147b3 am: 09f500e6a4 am: ed2b08430a
...
am: 0e2bdae581
2017-08-19 03:47:59 +00:00
Lorenzo Colitti
0e2bdae581
Merge changes I325b13d5,I89719fe7 am: 06b75147b3 am: 09f500e6a4
...
am: ed2b08430a
2017-08-19 03:38:10 +00:00
Lorenzo Colitti
ed2b08430a
Merge changes I325b13d5,I89719fe7 am: 06b75147b3
...
am: 09f500e6a4
2017-08-19 03:25:21 +00:00
Lorenzo Colitti
09f500e6a4
Merge changes I325b13d5,I89719fe7
...
am: 06b75147b3
2017-08-19 03:15:08 +00:00
Treehugger Robot
06b75147b3
Merge changes I325b13d5,I89719fe7
...
* changes:
Add tether offload traffic to interface stats as well.
Tell the system when tethering offload hits a limit.
2017-08-19 03:05:14 +00:00
Lorenzo Colitti
9787561bbe
Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev am: 2d10195128
...
am: a8743838c9
2017-08-19 01:12:35 +00:00
Lorenzo Colitti
3d7b64c52d
Add tether offload traffic to interface stats as well.
...
Currently, we only count add tethering traffic to per-UID
stats, but not to total data usage (i.e., dev and XT stats). This
is correct for software tethering, because all software forwarded
packets are already included in interface counters, but it is
incorrect for hardware offload, because such packets do not
increment interface counters.
To fix this:
1. Add an argument to ITetheringStatsProvider#getTetherStats to
indicate whether per-UID stats are requested. For clarity,
define integer constants STATS_PER_IFACE and STATS_PER_UID
to represent these operations.
2. Make NetdTetheringStatsProvider return stats only if per-UID
stats are requested. (Otherwise tethering traffic would be
double-counted).
3. Make OffloadController's stats provider return the same
stats regardless of whether per-UID stats were requested or
not.
4. Make NetworkStatsService add non-per-UID tethering stats to
the dev and XT snapshots. The per-UID snapshots were already
correctly adding in per-UID stats.
(cherry picked from commit 49ab263c0b
2017-08-19 10:12:05 +09:00
Lorenzo Colitti
a8743838c9
Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev
...
am: 2d10195128
2017-08-19 01:02:33 +00:00
Lorenzo Colitti
2d10195128
Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev
2017-08-19 00:54:59 +00:00
Lorenzo Colitti
49ab263c0b
Add tether offload traffic to interface stats as well.
...
Currently, we only count add tethering traffic to per-UID
stats, but not to total data usage (i.e., dev and XT stats). This
is correct for software tethering, because all software forwarded
packets are already included in interface counters, but it is
incorrect for hardware offload, because such packets do not
increment interface counters.
To fix this:
1. Add an argument to ITetheringStatsProvider#getTetherStats to
indicate whether per-UID stats are requested. For clarity,
define integer constants STATS_PER_IFACE and STATS_PER_UID
to represent these operations.
2. Make NetdTetheringStatsProvider return stats only if per-UID
stats are requested. (Otherwise tethering traffic would be
double-counted).
3. Make OffloadController's stats provider return the same
stats regardless of whether per-UID stats were requested or
not.
4. Make NetworkStatsService add non-per-UID tethering stats to
the dev and XT snapshots. The per-UID snapshots were already
correctly adding in per-UID stats.
Bug: 29337859
Bug: 32163131
Test: runtest frameworks-net
Test: runtest frameworks-telephony
Change-Id: I7a4d04ab47694d754874136179f8edad71099638
2017-08-19 00:21:56 +09:00
Hugo Benichi
cf65ae9d57
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: 46a7508229 am: 886144c1ff am: 77efec92fe
...
am: 0638f10802
2017-08-18 12:47:49 +00:00
Hugo Benichi
b319377255
Really allow NetworkAgent immutable updates to NetworkCapabilities
...
This patch completes commit bae105a5ccd11430bab14721d1325e2303a673da to
really allow updates of immutable capabilities to NetworkCapabilities of
NetworkAgents by using satisfiedByImmutableNetworkCapabilities instead
satisfiedByNetworkCapabilities.
Bug: 64125969
Test: runtest frameworks-net
Merged-In: I9beeb623792f0ee31abcd4ba9d0ba2451304fb2e
Merged-In: Ifbdd005576b3f0fbf278ecec81ce3e4308c6276d
Merged-In: Id352fdb6da21a2150d3e8d062d7eba11878f6919
Merged-In: If3742ea0e2151b9b710eda2fed280c31f7960393
Merged-In: Icd8e328e3c810a644bfb83798bd42fed8dc70425
(cherry picked from commit a60c6eab42cd904faaf26c23100939d397b80c39)
Change-Id: I737494117d7f1e0198f0ad4d3c41019c9295fe09
2017-08-18 12:44:26 +00:00
Hugo Benichi
0638f10802
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: 46a7508229 am: 886144c1ff
...
am: 77efec92fe
2017-08-18 12:36:31 +00:00
Hugo Benichi
77efec92fe
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: 46a7508229
...
am: 886144c1ff
2017-08-18 12:25:56 +00:00
Hugo Benichi
2d5491fe5d
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev am: 3f04e31eee -s ours
...
am: 3c4d2fc096
2017-08-18 12:14:58 +00:00
Hugo Benichi
886144c1ff
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b
...
am: 46a7508229
2017-08-18 12:14:56 +00:00
Hugo Benichi
46a7508229
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities"
...
am: cb3c24e36b
Change-Id: Ifbdd005576b3f0fbf278ecec81ce3e4308c6276d
2017-08-18 11:59:02 +00:00
Hugo Benichi
3c4d2fc096
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev
...
am: 3f04e31eee
2017-08-18 11:58:55 +00:00
Hugo Benichi
3f04e31eee
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev
2017-08-18 11:46:22 +00:00
Hugo Benichi
7afbea0e6e
Really allow NetworkAgent immutable updates to NetworkCapabilities
...
This patch completes commit 1ebf219ed9
2017-08-18 14:51:03 +09:00
Hugo Benichi
4053b03794
Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev am: de7117d3fe -s ours
...
am: de56184f72
2017-08-17 22:51:04 +00:00
Hugo Benichi
de56184f72
Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev
...
am: de7117d3fe
2017-08-17 22:38:34 +00:00
Hugo Benichi
de7117d3fe
Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev
2017-08-17 22:31:59 +00:00
Charles He
9522f15a56
Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev am: 8b2513e439
...
am: 0aeecd42a9
2017-08-17 08:12:56 +00:00
