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
Hugo Benichi
fcccb3a36d
Add L2~L4 information to packet wakeup logs and metrics
...
Example of $ adb shell dumpsys connmetrics list:
...
WakeupStats(wlan0, 21851s, total: 85, root: 0, system: 4, apps: 63, non-apps: 0, no uid: 18, l2 unicast/multicast/broadcast: 85/0/0, ethertype 0x800: 23, ethertype 0x86dd: 62, ipNxtHdr 6: 74, ipNxtHdr 17: 1, ipproto 58: 10)
...
WakeupEvent(06:55:54.094, wlan0, -1, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=216.58.200.110, dstIp=100.112.108.29, srcPort=443, dstPort=46878)
WakeupEvent(06:57:14.379, wlan0, -1, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=58, srcIp=ff02::1, dstIp=fe80::fa00:4:fd00:1)
WakeupEvent(06:57:52.786, wlan0, 1000, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=172.217.27.67, dstIp=100.112.108.29, srcPort=80, dstPort=49360)
WakeupEvent(06:58:02.919, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:809::200a, srcPort=443, dstPort=46197)
WakeupEvent(06:58:05.586, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:803::200a, srcPort=443, dstPort=46096)
Bug: 66869042
Test: runtest frameworks-net
+ manual testing by monitoring $ dumpsys connmetrics list
Change-Id: I03215c0c9fb7feda3e6ceb1b916f61f4ffb15344
2017-11-12 18:51:28 +09:00
Hugo Benichi
7e1e0d1583
Merge "MacAddress follow-up: define the core of the class" am: 005a90b337 am: d39a50350a
...
am: ca102e61ce
2017-11-09 12:55:56 +00:00
Hugo Benichi
ca102e61ce
Merge "MacAddress follow-up: define the core of the class" am: 005a90b337
...
am: d39a50350a
Change-Id: I1063cbb5a468818f68ee5406e52b6cd74c85c4bf
2017-11-09 12:43:52 +00:00
Hugo Benichi
005a90b337
Merge "MacAddress follow-up: define the core of the class"
2017-11-09 12:22:17 +00:00
Hugo Benichi
d380d14c4d
MacAddress follow-up: define the core of the class
...
Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583
2017-11-09 16:36:45 +09:00
Benedict Wong
269470d5a0
Merge "Update documentation for AES-GCM-ESP keymat length" am: fcbbf2b939 am: 6491b03410
...
am: e7e7095303
2017-11-08 18:27:06 +00:00
Benedict Wong
e7e7095303
Merge "Update documentation for AES-GCM-ESP keymat length" am: fcbbf2b939
...
am: 6491b03410
Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab
2017-11-08 18:12:25 +00:00
Benedict Wong
fcbbf2b939
Merge "Update documentation for AES-GCM-ESP keymat length"
2017-11-08 17:47:40 +00:00
Hugo Benichi
e75a60743d
Merge "Define MacAddress class" am: 925349ac8f am: 37caaaa705
...
am: 491a93b5ac
2017-11-08 06:57:00 +00:00
Hugo Benichi
491a93b5ac
Merge "Define MacAddress class" am: 925349ac8f
...
am: 37caaaa705
Change-Id: I377de35ab9ce9d8bf44bd90295a2a41fbea06d7a
2017-11-08 06:46:49 +00:00
Hugo Benichi
88ad29b907
Define MacAddress class
...
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
2017-11-08 11:09:49 +09:00
Benedict Wong
720c1249bf
Update documentation for AES-GCM-ESP keymat length
...
Added notes that keymat length must include 32 bits of salt.
Bug: 68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
2017-11-07 17:39:35 -08:00
Erik Kline
f7f5d4e654
Merge "Replace dns_tls with private_dns_mode setting" am: 3d806790c4 am: f1799116c2
...
am: 664bb6fc4f
2017-11-07 06:23:05 +00:00
Erik Kline
664bb6fc4f
Merge "Replace dns_tls with private_dns_mode setting" am: 3d806790c4
...
am: f1799116c2
Change-Id: I3e0448c045eb1072d0cd70a163ca355786b21cc4
2017-11-07 06:12:39 +00:00
Treehugger Robot
3d806790c4
Merge "Replace dns_tls with private_dns_mode setting"
2017-11-07 05:54:29 +00:00
Erik Kline
b0be3e6682
Replace dns_tls with private_dns_mode setting
...
Also includes:
- SettingsLib strings used in PrivateDnsModeDialogPreference
interaction in the Settings app
- rename ContentResolver "resolver" in methods working with
DNS resolvers (too confusing)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
- no new failures in SettingsBackupTest nor in SettingsProviderTest
- manual interaction with developer option works
Bug: 34953048
Bug: 64133961
Change-Id: Ia7502916db9ffa0792e1e500a35e34d06a88e79d
2017-11-07 12:47:36 +09:00
Hugo Benichi
0dfa4b300e
Merge "DefaultNetworkEvent metrics: rehaul" am: addecd1491 am: d025358166
...
am: 83e05af631
2017-11-06 07:41:53 +00:00
