ludi
cc00bd5639
Merge "Cleanup of resource limit tests" am: 7d0a38956e am: dc7693b146
...
am: 5b77df1729
2017-12-06 04:08:23 +00:00
ludi
5b77df1729
Merge "Cleanup of resource limit tests" am: 7d0a38956e
...
am: dc7693b146
2017-12-06 03:49:56 +00:00
ludi
dc7693b146
Merge "Cleanup of resource limit tests"
...
am: 7d0a38956e
2017-12-06 03:29:35 +00:00
Treehugger Robot
7d0a38956e
Merge "Cleanup of resource limit tests"
2017-12-06 02:58:41 +00:00
Hugo Benichi
731c83e23f
Merge "Expose the MacAddress class in the api"
2017-12-05 23:58:32 +00:00
Hugo Benichi
e06a0a395e
Merge "Fix bug in MacAddress.fromString()" am: cdb84d2fc7 am: a31109c229
...
am: 23649344d2
2017-12-05 10:09:35 +00:00
Hugo Benichi
23649344d2
Merge "Fix bug in MacAddress.fromString()" am: cdb84d2fc7
...
am: a31109c229
2017-12-05 10:01:19 +00:00
Hugo Benichi
a31109c229
Merge "Fix bug in MacAddress.fromString()"
...
am: cdb84d2fc7
Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
2017-12-05 09:47:50 +00:00
Hugo Benichi
21c7a52042
Fix bug in MacAddress.fromString()
...
Test: runtest frameworks-net
Bug: 69390696
Change-Id: I83f01e4915092e08ed201d9b6738bb02498d3bba
2017-12-05 13:14:08 +09:00
nharold
abbb6d7923
Merge "Validate IpSecAlgorithm Length" am: 98ecd7efb2 am: 2a20e7a677
...
am: 96af5bbd36
2017-12-05 02:46:06 +00:00
nharold
96af5bbd36
Merge "Validate IpSecAlgorithm Length" am: 98ecd7efb2
...
am: 2a20e7a677
2017-12-05 02:37:14 +00:00
nharold
2a20e7a677
Merge "Validate IpSecAlgorithm Length"
...
am: 98ecd7efb2
2017-12-05 02:28:10 +00:00
nharold
98ecd7efb2
Merge "Validate IpSecAlgorithm Length"
2017-12-05 02:13:55 +00:00
Jeff Sharkey
0e39b85de9
Merge "Match network roaming state to avoid wtf()." am: cd797a5069 am: 5f948c9bc1
...
am: 6e46b3bba8
2017-12-05 01:38:22 +00:00
Hugo Benichi
9768c1013e
Expose the MacAddress class in the api
...
Test: built, flashed, $ runtest frameworks-net
Bug: 69390696
Change-Id: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d
2017-12-05 10:30:31 +09:00
Jeff Sharkey
6e46b3bba8
Merge "Match network roaming state to avoid wtf()." am: cd797a5069
...
am: 5f948c9bc1
2017-12-05 01:28:55 +00:00
Jeff Sharkey
5f948c9bc1
Merge "Match network roaming state to avoid wtf()."
...
am: cd797a5069
2017-12-05 01:11:53 +00:00
Jeff Sharkey
cd797a5069
Merge "Match network roaming state to avoid wtf()."
2017-12-05 00:58:46 +00:00
Hugo Benichi
41dd9c894c
Merge "MacAddress: light refactors and improve documentation" am: d871cab32d am: 56eeb80dc5
...
am: 6600538c55
2017-12-05 00:06:50 +00:00
Hugo Benichi
6600538c55
Merge "MacAddress: light refactors and improve documentation" am: d871cab32d
...
am: 56eeb80dc5
2017-12-04 23:51:41 +00:00
Hugo Benichi
56eeb80dc5
Merge "MacAddress: light refactors and improve documentation"
...
am: d871cab32d
Change-Id: I51bb8786ecd7f53e3342625c7a2625007eedfc0f
2017-12-04 23:38:27 +00:00
Nathan Harold
82c3470df9
Validate IpSecAlgorithm Length
...
Improve the Validation of IpSecAlgorithm by
explicitly checking the length in addition to
the truncation length (previously an oversight).
In addition, we now check the lengths during
un-parceling, which will catch someone maliciously
manually building a parcel and passing it, bypassing
the checks in the constructor.
Bug: 68780091
Test: runtest -x IpSecAlgorithmTest.java
Change-Id: I8172762617264d34f47d5144336464510f07a701
2017-12-04 15:12:14 -08:00
Jeff Sharkey
58330a79bb
Match network roaming state to avoid wtf().
...
Test: sure
Bug: 70174865
Change-Id: I02faef05e3fb918c3c023fb2fdd1886d45cc8c71
Exempt-From-Owner-Approval: P0 bug
2017-12-04 15:52:54 -07:00
Hugo Benichi
5bc3546cf6
MacAddress: light refactors and improve documentation
...
This patch does some light refactoring in MacAddress to prepare for
exposing MacAddress in the public api:
- documention is improved
- some method names are renamed
- a toSafeString method is added
- a padding bug in the conversion methods outputting strings for
mac addresses is fixed
Bug: 69390696
Test: runtest frameworks-net
Change-Id: I399a97dabc2dfa8df9c5518c8b12484e43ca05c9
2017-12-04 22:34:43 +09:00
Sudheer Shanka
278d074254
Track some event history and include it in netpolicy dump.
...
Bug: 66921847
Test: manual
Change-Id: I0c473790f83076def807308fe44db9cb9365769e
2017-11-28 11:33:43 -08:00
ludi
de99e42cc8
Cleanup of resource limit tests
...
Test: runtest frameworks-net
Bug: 65688605
Change-Id: Ice3ff2624b83c833a99559485c1e782d36c54ae3
2017-11-28 10:21:18 -08:00
Jeff Sharkey
a58947af78
Merge "Clarify docs, sanity check roaming state." am: c80a1f23f3 am: 8c089f392e
...
am: e0b2908be9
2017-11-27 21:48:46 +00:00
Jeff Sharkey
e0b2908be9
Merge "Clarify docs, sanity check roaming state." am: c80a1f23f3
...
am: 8c089f392e
2017-11-27 21:39:56 +00:00
Jeff Sharkey
8c089f392e
Merge "Clarify docs, sanity check roaming state."
...
am: c80a1f23f3
2017-11-27 21:30:57 +00:00
Jeff Sharkey
c80a1f23f3
Merge "Clarify docs, sanity check roaming state."
2017-11-27 21:19:40 +00:00
Jeff Sharkey
9ff2ddd7e7
Clarify docs, sanity check roaming state.
...
Update public docs to hide the fact that NetworkCapabilities is only
used inside NetworkRequest as an implementation detail.
Take up less room on the wire when passing NetworkCapabilities around
via NetworkRequest.
Sanity check that the roaming state between NetworkInfo and
NetworkCapabilities is in agreement.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.,com.android.server.ConnectivityServiceTest
Bug: 67040695
Change-Id: I982b4c3c41a140934bbad3b8ca8f12dc3814e86c
2017-11-27 12:47:14 -07:00
Hugo Benichi
eea9d96507
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging" am: 9632d1eef4 am: 2c939b0d7a
...
am: 5b13decb2a
2017-11-15 22:59:32 +00:00
Hugo Benichi
5b13decb2a
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging" am: 9632d1eef4
...
am: 2c939b0d7a
2017-11-15 22:50:22 +00:00
Hugo Benichi
2c939b0d7a
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging"
...
am: 9632d1eef4
2017-11-15 22:42:50 +00:00
Hugo Benichi
9632d1eef4
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging"
2017-11-15 22:31:59 +00:00
Di Lu
d874098ad3
Merge "Add test case for user quota management in IpSecService" am: baaa5670f5 am: 4288bb9e34
...
am: e8c8f6267d
2017-11-15 20:39:53 +00:00
Di Lu
e8c8f6267d
Merge "Add test case for user quota management in IpSecService" am: baaa5670f5
...
am: 4288bb9e34
2017-11-15 20:31:37 +00:00
Di Lu
4288bb9e34
Merge "Add test case for user quota management in IpSecService"
...
am: baaa5670f5
2017-11-15 20:23:14 +00:00
Di Lu
baaa5670f5
Merge "Add test case for user quota management in IpSecService"
2017-11-15 20:12:38 +00:00
Xin Li
d4544492a9
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. am: acae66beee -s ours
...
am: dbb2641147
2017-11-15 02:39:52 +00:00
Xin Li
dbb2641147
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
...
am: acae66beee
2017-11-15 01:30:08 +00:00
Xin Li
acae66beee
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
...
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Hugo Benichi
2efffd7c77
IP connectivity metrics: fix LINGER/UNLINGER logging
...
This patch fixes a regression introduced by commit d5c11bbb65d5c11bbb65
2017-11-14 22:34:38 +09:00
Hugo Benichi
919987e3d5
Merge "IP connectivity metrics: NetworkEvents have transports" am: a37e03886f am: f3ada43f6e
...
am: c90d3a0bbd
2017-11-14 12:03:25 +00:00
Hugo Benichi
1920023b5f
Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3 am: ab15f7fc64
...
am: 3f23c704ab
2017-11-14 11:55:45 +00:00
Hugo Benichi
c90d3a0bbd
Merge "IP connectivity metrics: NetworkEvents have transports" am: a37e03886f
...
am: f3ada43f6e
Change-Id: I8cd50ea805fe3e533c0fc21b220827155cb0d23b
2017-11-14 01:46:23 +00:00
Hugo Benichi
3f23c704ab
Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3
...
am: ab15f7fc64
Change-Id: I9dba29b10c824d382b08b16313e49cc8c775f7eb
2017-11-14 01:40:06 +00:00
ludi
296907da6a
Add test case for user quota management in IpSecService
...
Test: runtest frameworks-net
Bug: 65688605
Change-Id: I3210c4920d0ac1d09fecb56c25e392e2bcba641f
2017-11-13 14:14:11 -08:00
Hugo Benichi
a37e03886f
Merge "IP connectivity metrics: NetworkEvents have transports"
2017-11-13 13:13:44 +00:00
Hugo Benichi
d5c11bbb65
IP connectivity metrics: NetworkEvents have transports
...
Also removes netId field from inside NetworkEvent and stop populating
the network_id field of the NetworkEvent field, deprecating it.
Bug: 34901696
Test: runtest frameworks-net,
manually looking at $ adb shell dumpsys connmetrics
Change-Id: I2c36860f976898883714f72f4d18e06da250c6a6
2017-11-13 14:15:51 +09:00
