Xin Li
fa4b4aff87
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5c01207b27 -s ours
...
am: 3aafa4c9ce
Change-Id: I0e586f759df230aeff2dd045e5ff1d138d284ec3
2017-12-07 08:34:18 +00:00
Xin Li
5c01207b27
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:26 +00:00
ludi
c5d7f3b714
Merge "Cleanup of resource limit tests" am: 5bb84059ba
...
am: 6cd30fe9d5
2017-12-06 03:49:56 +00:00
ludi
6cd30fe9d5
Merge "Cleanup of resource limit tests"
...
am: 5bb84059ba
2017-12-06 03:29:35 +00:00
Treehugger Robot
5bb84059ba
Merge "Cleanup of resource limit tests"
2017-12-06 02:58:41 +00:00
Hugo Benichi
09a9fc003d
Merge "Fix bug in MacAddress.fromString()" am: cdb84d2fc7
...
am: 7d3ce34445
2017-12-05 10:01:19 +00:00
Hugo Benichi
7d3ce34445
Merge "Fix bug in MacAddress.fromString()"
...
am: cdb84d2fc7
Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
2017-12-05 09:47:50 +00:00
Hugo Benichi
06d9bd1560
Fix bug in MacAddress.fromString()
...
Test: runtest frameworks-net
Bug: 69390696
Change-Id: I83f01e4915092e08ed201d9b6738bb02498d3bba
2017-12-05 13:14:08 +09:00
nharold
b0f302f7ad
Merge "Validate IpSecAlgorithm Length" am: b592c42328
...
am: ae3d30d148
2017-12-05 02:37:14 +00:00
nharold
ae3d30d148
Merge "Validate IpSecAlgorithm Length"
...
am: b592c42328
2017-12-05 02:28:10 +00:00
nharold
b592c42328
Merge "Validate IpSecAlgorithm Length"
2017-12-05 02:13:55 +00:00
Jeff Sharkey
8e0436d6f6
Merge "Match network roaming state to avoid wtf()." am: 32e8144344
...
am: a5d7f82fec
2017-12-05 01:28:55 +00:00
Jeff Sharkey
a5d7f82fec
Merge "Match network roaming state to avoid wtf()."
...
am: 32e8144344
2017-12-05 01:11:53 +00:00
Jeff Sharkey
32e8144344
Merge "Match network roaming state to avoid wtf()."
2017-12-05 00:58:46 +00:00
Hugo Benichi
18f79574b4
Merge "MacAddress: light refactors and improve documentation" am: d871cab32d
...
am: 2c7122d826
2017-12-04 23:51:41 +00:00
Hugo Benichi
2c7122d826
Merge "MacAddress: light refactors and improve documentation"
...
am: d871cab32d
Change-Id: I51bb8786ecd7f53e3342625c7a2625007eedfc0f
2017-12-04 23:38:27 +00:00
Nathan Harold
22ac4e5300
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
38fe380e44
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
e9667249da
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
ludi
126c2f71bf
Cleanup of resource limit tests
...
Test: runtest frameworks-net
Bug: 65688605
Change-Id: Ice3ff2624b83c833a99559485c1e782d36c54ae3
2017-11-28 10:21:18 -08:00
Jeff Sharkey
8a0d36697a
Merge "Clarify docs, sanity check roaming state." am: 119611ed11
...
am: 2b3a7b86cc
2017-11-27 21:39:56 +00:00
Jeff Sharkey
2b3a7b86cc
Merge "Clarify docs, sanity check roaming state."
...
am: 119611ed11
2017-11-27 21:30:57 +00:00
Jeff Sharkey
119611ed11
Merge "Clarify docs, sanity check roaming state."
2017-11-27 21:19:40 +00:00
Jeff Sharkey
d54240807c
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
ab97c357e3
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging" am: aba1505896
...
am: f051bb1121
2017-11-15 22:50:22 +00:00
Hugo Benichi
f051bb1121
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging"
...
am: aba1505896
2017-11-15 22:42:50 +00:00
Hugo Benichi
aba1505896
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging"
2017-11-15 22:31:59 +00:00
Di Lu
c6d1006f05
Merge "Add test case for user quota management in IpSecService" am: 9faa64ff17
...
am: 86c137bdd0
2017-11-15 20:31:37 +00:00
Di Lu
86c137bdd0
Merge "Add test case for user quota management in IpSecService"
...
am: 9faa64ff17
2017-11-15 20:23:14 +00:00
Di Lu
9faa64ff17
Merge "Add test case for user quota management in IpSecService"
2017-11-15 20:12:38 +00:00
Xin Li
803279b054
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
...
am: 3fa5c2b1a8
2017-11-15 01:30:08 +00:00
Xin Li
3fa5c2b1a8
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
ad9dc5b6f0
IP connectivity metrics: fix LINGER/UNLINGER logging
...
This patch fixes a regression introduced by commit c3b3c5345ac3b3c5345a
2017-11-14 22:34:38 +09:00
Hugo Benichi
a5cd5e8643
Merge "IP connectivity metrics: NetworkEvents have transports" am: 703eca1a5d
...
am: f3ada43f6e
Change-Id: I8cd50ea805fe3e533c0fc21b220827155cb0d23b
2017-11-14 01:46:23 +00:00
Hugo Benichi
3fade329de
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
20e1c8af67
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
703eca1a5d
Merge "IP connectivity metrics: NetworkEvents have transports"
2017-11-13 13:13:44 +00:00
Hugo Benichi
c3b3c5345a
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
b57b87637c
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
bf336d1b13
Merge "MacAddress follow-up: define the core of the class" am: 812a753069
...
am: d39a50350a
Change-Id: I1063cbb5a468818f68ee5406e52b6cd74c85c4bf
2017-11-09 12:43:52 +00:00
Hugo Benichi
812a753069
Merge "MacAddress follow-up: define the core of the class"
2017-11-09 12:22:17 +00:00
Hugo Benichi
87c1532773
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
1e0eccff43
Merge "Update documentation for AES-GCM-ESP keymat length" am: b772a466c4
...
am: 6491b03410
Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab
2017-11-08 18:12:25 +00:00
Benedict Wong
b772a466c4
Merge "Update documentation for AES-GCM-ESP keymat length"
2017-11-08 17:47:40 +00:00
Hugo Benichi
3a818a0049
Merge "Define MacAddress class" am: 925349ac8f
...
am: 37caaaa705
Change-Id: I377de35ab9ce9d8bf44bd90295a2a41fbea06d7a
2017-11-08 06:46:49 +00:00
Hugo Benichi
1881890778
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
698bd80129
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
9250d3b593
Merge "Replace dns_tls with private_dns_mode setting" am: 32b13a9943
...
am: f1799116c2
Change-Id: I3e0448c045eb1072d0cd70a163ca355786b21cc4
2017-11-07 06:12:39 +00:00
Treehugger Robot
32b13a9943
Merge "Replace dns_tls with private_dns_mode setting"
2017-11-07 05:54:29 +00:00
Erik Kline
1ecdd96e89
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
