Hugo Benichi
8c23345c6e
Merge "Nat464Xlat: clat management cleanup" am: 81b179cfdd am: bd5610af79 am: da71487a59
...
am: 7f0c130788
2017-08-28 12:35:38 +00:00
Hugo Benichi
7f0c130788
Merge "Nat464Xlat: clat management cleanup" am: 81b179cfdd am: bd5610af79
...
am: da71487a59
Change-Id: I06661bd6bd1456ba34a3bbdb52c120ac01da9d61
2017-08-28 12:21:10 +00:00
Hugo Benichi
bd5610af79
Merge "Nat464Xlat: clat management cleanup"
...
am: 81b179cfdd
Change-Id: Ic3808a1afe48efac745b1b378fb12cc5678918ec
2017-08-28 12:01:25 +00:00
Hugo Benichi
adbbac97c5
Nat464Xlat: internal state guards cleanup + state enum
...
This patch does some cleanup of Nat464Xlat internal state guards
against the Nat464Xlat state Idle | Started | Running, which reduces
code nesting.
It also replaces introspection of internal state for distinguishing
between different stages in 464xlat lifecycle with an enum explicitly
introducing these three Idle | Started | Running states.
Bug: 62997041
Bug: 64571917
Test: runtest frameworks-net
manually connected to ipv6 network and went to test-ipv6.com
Change-Id: I6efc9fed2420ca488731a2b9b9c3c025b16eca10
2017-08-28 15:29:27 +09:00
Hugo Benichi
55d8ae3377
Nat464Xlat: clat management cleanup
...
This patch does some minor refactoring of clat starting/stopping code:
- remove unused LinkProperties arguments in updateClat
- remove unused Context argument in Nat464Xlat ctor
- introduce ensureClatIsStarted and ensureClatIsStopped methods and
simplify updateClat
- add clatd to NetworkAgentInfo toString() method
- clarify some comments
This changes prepare for moving BaseNetworkObserver callbacks to
ConnectivityService.
Bug: 62997041
Bug: 64571917
Test: runtest frameworks-net
manually connected to IPv6 only network and went to test-ipv6.com
Change-Id: Idb204784614cfe700f73255a7a7b78c5e9ee6eca
2017-08-28 15:29:23 +09:00
Hugo Benichi
60aafd4f98
Merge "Make NetworkManagementServiceTest pass again." am: 29b1826ff2 am: bfe44f641d am: c933ef6c54
...
am: 2b89a6f05d
2017-08-24 04:21:14 +00:00
Hugo Benichi
2b89a6f05d
Merge "Make NetworkManagementServiceTest pass again." am: 29b1826ff2 am: bfe44f641d
...
am: c933ef6c54
Change-Id: Ic39262b1f650695cc6903c3a9e2ddb592d47b365
2017-08-24 04:09:14 +00:00
Hugo Benichi
bfe44f641d
Merge "Make NetworkManagementServiceTest pass again."
...
am: 29b1826ff2
Change-Id: If7fafa0922fdbc499c0c911a3f88ede9c8a26c1d
2017-08-24 03:46:07 +00:00
Lorenzo Colitti
3b43a4a047
Make NetworkManagementServiceTest pass again.
...
1. Mock the service manager so that NMS can fetch mock versions
of INetd and IBatteryStats.
2. Call LocalServices.removeServiceForTest to avoid a duplicate
service registration error. // check this
3. Change the timeout from 100ms to 200ms, as otherwise the tests
that check for IfaceClass fail.
4. Convert NetworkManagementServiceTest to JUnit 4.
5. Move NetworkManagementServiceTest to tests/net
Bug: 29337859
Bug: 32163131
Bug: 32561414
Bug: 62918393
Test: runtest frameworks-net
Change-Id: Ic7371b427b35809ccd446addf35c9d8ae99ccfd3
2017-08-23 09:49:05 +09:00
Tobias Thierer
928b838edb
Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: 811e215e2c am: 41ff948711 am: e7776bd372 am: 8f55753777
...
am: f65e355e1d
2017-08-22 15:51:15 +00:00
Tobias Thierer
f65e355e1d
Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: 811e215e2c am: 41ff948711 am: e7776bd372
...
am: 8f55753777
2017-08-22 15:40:30 +00:00
Tobias Thierer
8f55753777
Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: 811e215e2c am: 41ff948711
...
am: e7776bd372
2017-08-22 15:28:07 +00:00
Tobias Thierer
e7776bd372
Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs" am: 811e215e2c
...
am: 41ff948711
2017-08-22 15:16:31 +00:00
Baligh Uddin
0dd189632f
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours am: 92363c4e9f -s ours am: c8a6298b3f -s ours
...
am: 2899590223
2017-08-22 15:08:23 +00:00
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
Tobias Thierer
41ff948711
Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs"
...
am: 811e215e2c
2017-08-22 15:00:24 +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
Tobias Thierer
811e215e2c
Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs"
2017-08-22 14:07:16 +00:00
Baligh Uddin
2899590223
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours am: 92363c4e9f -s ours
...
am: c8a6298b3f
2017-08-21 23:48:39 +00:00
Baligh Uddin
c8a6298b3f
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: e811770999 -s ours
...
am: 92363c4e9f
2017-08-21 23:33:54 +00:00
Baligh Uddin
92363c4e9f
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
...
am: e811770999
2017-08-21 22:57:31 +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
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
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
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
