Hugo Benichi
88216649e1
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" into oc-dev am: f37b271894 -s ours
...
am: bb19c87d68
2017-05-10 08:49:28 +00:00
Hugo Benichi
bb19c87d68
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" into oc-dev
...
am: f37b271894 -s ours
Change-Id: I28f139b2bc5a42eed4caf01bea7a1a9426a91625
2017-05-10 08:38:56 +00:00
Hugo Benichi
053b8f91b6
Merge "Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: 183d968881 am: 76dc14ec88 am: 1697d48faf" into oc-dev-plus-aosp
...
am: 18d29a6ee8
2017-05-10 02:12:15 +00:00
Hugo Benichi
ae49870916
Merge "Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: 183d968881 am: 76dc14ec88 am: 1697d48faf" into oc-dev-plus-aosp
...
am: f8dbdba5a2
Change-Id: Ie09f2b4e04749e61923781f4b13e796054108fad
2017-05-10 02:06:06 +00:00
Android Build Merger (Role)
18d29a6ee8
Merge "Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: 183d968881 am: 76dc14ec88 am: 1697d48faf" into oc-dev-plus-aosp
2017-05-10 00:47:39 +00:00
Hugo Benichi
2362279537
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: 183d968881 am: 76dc14ec88
...
am: 1697d48faf
Change-Id: I8b0cf31ef356aae9992f893ca35001d048999519
2017-05-10 00:44:51 +00:00
Hugo Benichi
373ab28387
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: 183d968881 am: 76dc14ec88
...
am: 1697d48faf
Change-Id: I7dbfe3c96678e2325eb533f31523ad10d861ad02
2017-05-10 00:40:28 +00:00
Hugo Benichi
6c07bead32
NetworkStatsFactory: fix double accounting on IPv6 only networks
...
For 464xlat scenarios on IPv6 networks, the clatd interface setup
introduces double counting of apps ipv4 traffic. NetworkStatsFactory was
accounting for this on the tx path, but not on the rx path. Also it did
not accounted for the 20 bytes added by the IPv6 header.
This patch subtract correctly the rx and tx traffic from the root uid on
the underlying interface, and also adds correctly the 20 bytes cost per
packet on the stacked interface for 464xlat traffic.
Test: added several new unit tests, based on synthetic data and real
data also.
Bug: 33681750
Change-Id: I4867fe181938d94b5594b3d88896a3c4e01d895c
Merged-In: I2675643b220acbc6110179fa937d4c313b6f5e32
(cherry picked from commit e1bb3a14d1ee1aba2f92e5bccf659774699eaffe)
2017-05-10 09:19:12 +09:00
Hugo Benichi
183d968881
Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks"
2017-05-10 00:07:29 +00:00
Hugo Benichi
043095b615
NetworkStatsFactory: fix double accounting on IPv6 only networks
...
For 464xlat scenarios on IPv6 networks, the clatd interface setup
introduces double counting of apps ipv4 traffic. NetworkStatsFactory was
accounting for this on the tx path, but not on the rx path. Also it did
not accounted for the 20 bytes added by the IPv6 header.
This patch subtract correctly the rx and tx traffic from the root uid on
the underlying interface, and also adds correctly the 20 bytes cost per
packet on the stacked interface for 464xlat traffic.
Test: added several new unit tests, based on synthetic data and real
data also.
Bug: 33681750
Change-Id: I2675643b220acbc6110179fa937d4c313b6f5e32
2017-05-09 22:46:14 +09:00
Android Build Merger (Role)
82899a874a
Merge "Merge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc3a -s ours am: 1217cfd0c3 -s ours"
2017-05-09 06:49:26 +00:00
Lorenzo Colitti
d43686fd6a
Merge "Move some NetworkStats tests to tests/net." into oc-dev am: 74fe2cbc3a -s ours
...
am: 1217cfd0c3
2017-05-09 06:46:48 +00:00
Lorenzo Colitti
1217cfd0c3
Merge "Move some NetworkStats tests to tests/net." into oc-dev
...
am: 74fe2cbc3a -s ours
Change-Id: I4c58d302385c733108614c681632d3a8bc2dbdcf
2017-05-09 06:40:41 +00:00
Hugo Benichi
0313b3cbf7
Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2 am: 717238a614 am: 44e9b81c54
...
am: 4799bdc8fa
2017-05-09 06:39:13 +00:00
Hugo Benichi
4799bdc8fa
Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2 am: 717238a614
...
am: 44e9b81c54
Change-Id: I9c38d1254f82b50f4d1e953e72bf15a46562d3b8
2017-05-09 06:30:48 +00:00
Hugo Benichi
fc28684dda
NsdService: test coverage for client requests.
...
Adding coverage for:
- NsdManager client disconnection
- in-flight request GC
Test: new test passes
Bug: 37013369, 33298084
Change-Id: I92039f297cf99352bbf4196797933d89c0b819ff
2017-05-09 10:49:33 +09:00
Lorenzo Colitti
2d33d8d3f5
Move some NetworkStats tests to tests/net.
...
This groups them together with the rest of the networking unit
tests. It also speeds up compile/test cycles ("runtest -x" of one
file goes from 1m15s to 30s).
Bug: 33681750
Test: runtest frameworks-net passes on internal tree
Merged-In: I53cb0c51355fe4b4b30e451fa09fbbf58da39efd
Change-Id: I5ae5dbf74c94feb0fe3759681e5e6d6fba62fa32
(cherry picked from commit c86013be936f36c61fa0cdfad95141f6de3c6ef7)
2017-05-08 08:38:08 +00:00
Hugo Benichi
a0e77edc9e
Merge "NsdManager: add test coverage for discoverServices()" am: 3e21b1745c am: 60182dbe4e am: 27b0eebb4d
...
am: 66e8ca2dd0
2017-05-02 09:09:55 +00:00
Hugo Benichi
66e8ca2dd0
Merge "NsdManager: add test coverage for discoverServices()" am: 3e21b1745c am: 60182dbe4e
...
am: 27b0eebb4d
Change-Id: I46acfd104ac3457126c3ccef5041788e4146321c
2017-05-02 09:04:59 +00:00
Hugo Benichi
fd587d55c8
Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c am: bc57faa1ac am: 9a3e69d9b6
...
am: 4c1fa0a879
2017-05-02 06:56:15 +00:00
Hugo Benichi
4c1fa0a879
Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c am: bc57faa1ac
...
am: 9a3e69d9b6
Change-Id: Ideabb1c929ddd4307e66831cddb20e2feac2c6d9
2017-05-02 06:49:52 +00:00
Hugo Benichi
0cf8c59a45
NsdManager: add test coverage for discoverServices()
...
Test: added new tests
Bug: 37013369, 33298084
Change-Id: If6c1113ee1bd4690db90abd5a61c3e229c827aec
2017-05-02 15:26:33 +09:00
Lorenzo Colitti
29fd201d7b
Merge "Add a method to start the captive portal login app." into oc-dev am: 5555b1e3d1
...
am: 4d3453c255
2017-05-02 04:51:08 +00:00
Lorenzo Colitti
4d3453c255
Merge "Add a method to start the captive portal login app." into oc-dev
...
am: 5555b1e3d1
Change-Id: Ic7c14bd3dfd07f97c04901f043ed1cd3b1eee6e4
2017-05-02 04:44:31 +00:00
Hugo Benichi
b00460ae8e
NsdManager: unit test coverage for servive registration
...
This patch adds test coverage for NsdManager#registerService() and
NsdManager#unregisterService(). This test shows a potential defect in
the api: if unregisterService() fails, the associated listener is always
unregistered from NsdManager. If the service initially registered is
still registered, this potentially make it impossible to unregister.
Test: added new unit test
Bug: 37013369, 33298084
Change-Id: Ia089b6d2f2a349907a8b29d9a3acd7f59e177887
2017-05-02 13:31:24 +09:00
Lorenzo Colitti
755e796e5e
Add a method to start the captive portal login app.
...
Bug: 36203355
Bug: 36656914
Test: ConnectivityServiceTest (including new test) passes
Change-Id: I82a9a9a8da47870ba3f1bbef5941b37e970c844f
2017-05-01 16:01:15 +09:00
Lorenzo Colitti
67288eb53d
Merge "Address ConnectivityManager API comments." into oc-dev am: f782c1d836
...
am: 5a8680d7a4
2017-04-28 04:11:54 +00:00
Lorenzo Colitti
5a8680d7a4
Merge "Address ConnectivityManager API comments." into oc-dev
...
am: f782c1d836
2017-04-28 04:04:21 +00:00
Lorenzo Colitti
f782c1d836
Merge "Address ConnectivityManager API comments." into oc-dev
2017-04-28 03:58:16 +00:00
Lorenzo Colitti
38ea810b27
Address ConnectivityManager API comments.
...
Bug: 36370941
Test: marlin builds and boots
Change-Id: I693ee5270bf186c88c7c5056293519f7237504ff
2017-04-28 00:58:00 +09:00
Hugo Benichi
c39f81e439
Merge "NsdManager: unit tests for argument validation" am: 3cff7deecb am: d97e358f7a am: 48947de481
...
am: 0e50827fea
2017-04-27 13:16:11 +00:00
Hugo Benichi
8aaf306011
Merge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20 am: 47748b754c am: 5d0bd13538
...
am: b2ce5b2847
2017-04-27 13:14:10 +00:00
Hugo Benichi
0e50827fea
Merge "NsdManager: unit tests for argument validation" am: 3cff7deecb am: d97e358f7a
...
am: 48947de481
Change-Id: I8a51ff51071adc60fe9f4d99ec629edabbed353d
2017-04-27 13:09:02 +00:00
Hugo Benichi
b2ce5b2847
Merge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20 am: 47748b754c
...
am: 5d0bd13538
Change-Id: Ic8ddf92c7c64d4214a75bea6d6e5083f4612a76a
2017-04-27 13:06:59 +00:00
Hugo Benichi
99917e5cfb
NsdManager: unit tests for argument validation
...
Test: new tests pass.
Bug: 37013369, 33298084
Change-Id: Ia514d2bbd967d46fed54e379f319b572ade22c62
2017-04-27 16:35:48 +09:00
Hugo Benichi
ee4eb706eb
NsdService: disentangle NativeDaemonConnector from ctor
...
This patch disentangles the creation of NativeDaemonConnector from the
creation of NsdService by introducing a wrapper type DaemonConnection.
This allows to mock this dependency in unit tests.
Test: enhanced previously introduced new tests.
Bug: 37013369, 33298084
Change-Id: I894b7cddfc509f86d0134d214c88c063b81b5e0a
2017-04-27 16:35:30 +09:00
Hugo Benichi
f5ca9cc774
Merge "NsdService: bootstrap unit tests" am: 163201bd74 am: dd53c962b2 am: d29ce6ae8c
...
am: 3489494edc
2017-04-27 06:01:38 +00:00
Hugo Benichi
3489494edc
Merge "NsdService: bootstrap unit tests" am: 163201bd74 am: dd53c962b2
...
am: d29ce6ae8c
Change-Id: Iaf0679790e934baaaf48bcb04098aa18deca4d60
2017-04-27 05:49:47 +00:00
Hugo Benichi
163201bd74
Merge "NsdService: bootstrap unit tests"
2017-04-27 05:22:54 +00:00
Erik Kline
a02a6b1658
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev am: 40ccb1b5aa
...
am: 00dc131391
2017-04-27 04:08:10 +00:00
Erik Kline
00dc131391
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
...
am: 40ccb1b5aa
Change-Id: Ie883f62bdc731c8da3b3d5ac1df827e1fd5b44be
2017-04-27 03:58:12 +00:00
Erik Kline
9ee878a8bb
Merge "Clarify some IpManager/ApfFilter debugging output." am: ce94c07ffd am: 3cc7ccfc69 am: b1914ebb50
...
am: b3da49d3fb
2017-04-27 00:46:41 +00:00
Erik Kline
b3da49d3fb
Merge "Clarify some IpManager/ApfFilter debugging output." am: ce94c07ffd am: 3cc7ccfc69
...
am: b1914ebb50
Change-Id: If64f2b8a5cdf8b946a82a0c97a42cf61ef5e0b08
2017-04-27 00:35:25 +00:00
Erik Kline
c6e8acfab2
Clarify some IpManager/ApfFilter debugging output.
...
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- "adb shell dumpsys wifi ipmanager" shows updated output
Bug: 34793131
Change-Id: I6dec135b97343943efb421ef7b2e84c4751dd5ea
(cherry picked from commit af579eb5b516296a8ec0b02d824f2ba646e60ca2)
2017-04-26 17:17:04 +09:00
Erik Kline
55af7a2f07
Clarify some IpManager/ApfFilter debugging output.
...
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- "adb shell dumpsys wifi ipmanager" shows updated output
Bug: 34793131
Change-Id: I6dec135b97343943efb421ef7b2e84c4751dd5ea
2017-04-26 17:14:47 +09:00
Etan Cohen
35e04cc4fb
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: ff8fdb4ad3 am: 3c6305cc55 am: 887fd90742
...
am: 8e405c10f6
2017-04-25 13:46:42 +00:00
Etan Cohen
8e405c10f6
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: ff8fdb4ad3 am: 3c6305cc55
...
am: 887fd90742
Change-Id: I8480ac43d89dc85b541e6255c3cdc597393896cf
2017-04-25 13:40:42 +00:00
Etan Cohen
ff8fdb4ad3
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
2017-04-25 13:21:36 +00:00
Hugo Benichi
81a38c1efd
Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp
...
am: c3d2f25a5d
Change-Id: I1e039236d7d4eda6354c81440fbbc43346376f23
2017-04-25 08:09:32 +00:00
Hugo Benichi
f2e9c2179e
NetworkCapabilities: remove duplicated TRANSPORT_NAMES
...
Due to multi-branch automerging issue, TRANSPORT_NAMES got inserted
twice into NetworkCapabilities both by commits 0ff6fce27b25e35a987b
2017-04-25 16:31:06 +09:00
