Igor Murashkin
a273d2561b
Merge changes into stage-aosp-master am: 751838ee1d
...
am: b5310fb1a0
2018-10-05 12:12:17 -07:00
Igor Murashkin
e577b00935
Merge changes into stage-aosp-master
...
am: 3a955b82c1
2018-10-05 11:57:18 -07:00
Igor Murashkin
b5310fb1a0
Merge changes into stage-aosp-master
...
am: 751838ee1d
2018-10-05 11:50:43 -07:00
Yan Yan
7947437af7
Merge changes I10c01f2b,Ie05bc535
...
am: 8e3ad8b525
2018-10-05 11:47:12 -07:00
Yan Yan
8e3ad8b525
Merge changes I10c01f2b,Ie05bc535
...
* changes:
Check to ensure UDP-encap is used only for IPv4
Add UDP encapsulation tests for IpSecService.
2018-10-05 17:38:41 +00:00
Android Build Merger (Role)
3a955b82c1
Merge changes into stage-aosp-master
2018-10-05 17:35:26 +00:00
Android Build Merger (Role)
751838ee1d
Merge changes into stage-aosp-master
2018-10-05 17:35:26 +00:00
evitayan
43d93a0c78
Check to ensure UDP-encap is used only for IPv4
...
This commit checks if UDP-encapsulation is used
for unsupported address family and throws
IllegalArgumentException when it happens.
Bug: 74213459
Test: Tests added in testCreateTransportModeTransformWithEncap
and testCreateTunnelModeTransformWithEncap.
Command: runtest frameworks-net
Verified on taimen.
Change-Id: I10c01f2bad6aca23430849ea9ef6c1eb157ae131
2018-10-04 11:44:00 -07:00
Chalard Jean
df7d98e7a4
Merge "Delay global alerts by 1s for high thresholds" am: a31118e420 am: dc6e65b3f0
...
am: b06e8f4f34
2018-10-04 02:18:19 -07:00
Chalard Jean
b06e8f4f34
Merge "Delay global alerts by 1s for high thresholds" am: a31118e420
...
am: dc6e65b3f0
2018-10-04 01:57:53 -07:00
Chalard Jean
dc6e65b3f0
Merge "Delay global alerts by 1s for high thresholds"
...
am: a31118e420
2018-10-04 01:48:00 -07:00
Treehugger Robot
a31118e420
Merge "Delay global alerts by 1s for high thresholds"
2018-10-04 08:17:11 +00:00
Chalard Jean
d966e8cf28
Delay global alerts by 1s for high thresholds
...
By skipping updates if an alert is already scheduled, this avoids firing
the global alert too often on devices with high transfer speeds and high
quota.
Test: with tethering watching videos. Also runtest frameworks-net
Bug: 117243748
Change-Id: Idce6059832db7a0e4a7117bbb3e424ec62ae3b21
2018-10-04 01:30:43 +00:00
Chenbo Feng
684c94973c
Merge "Don't check qtaguid file unless using them" am: 0ce43570f5 am: 8eb31202df
...
am: b127d68ca2
2018-09-28 12:52:12 -07:00
Chenbo Feng
b127d68ca2
Merge "Don't check qtaguid file unless using them" am: 0ce43570f5
...
am: 8eb31202df
2018-09-28 12:32:50 -07:00
Chenbo Feng
8eb31202df
Merge "Don't check qtaguid file unless using them"
...
am: 0ce43570f5
2018-09-28 12:15:54 -07:00
Treehugger Robot
0ce43570f5
Merge "Don't check qtaguid file unless using them"
2018-09-28 18:35:47 +00:00
Benedict Wong
92334a78e0
Merge "Re-enable checks for MANAGE_IPSEC_TUNNELS" am: 4f94cbe619 am: e2778b09ad
...
am: 319d308884
2018-09-19 17:33:21 -07:00
Benedict Wong
319d308884
Merge "Re-enable checks for MANAGE_IPSEC_TUNNELS" am: 4f94cbe619
...
am: e2778b09ad
2018-09-19 17:23:54 -07:00
Benedict Wong
e2778b09ad
Merge "Re-enable checks for MANAGE_IPSEC_TUNNELS"
...
am: 4f94cbe619
2018-09-19 17:10:42 -07:00
Benedict Wong
4f94cbe619
Merge "Re-enable checks for MANAGE_IPSEC_TUNNELS"
2018-09-19 21:46:05 +00:00
Chenbo Feng
5c0232c572
Don't check qtaguid file unless using them
...
The proc file of xt_qtaguid module is not necessarily exist on future
devices. We should only check it if the device need to read the stats
file for network usage information.
Bug: 79938294
Test: NetworkUsageStatsTest TrafficStatsTest
Change-Id: I5ac6feef8b9a26daa68b381a985925e24b0d80af
2018-09-14 16:13:14 -07:00
Benedict Wong
2b6a14ecf3
Re-enable checks for MANAGE_IPSEC_TUNNELS
...
This patch ensures that creation and modification of IPsec tunnels
requires the MANAGE_IPSEC_TUNNELS appop.
Bug: 115685048
Test: IpSecManagerTunnelTest fails without appops set
Change-Id: I6c60a2573ca521717877f36e28a392b0d3b62754
2018-09-13 16:50:35 -07:00
Shaotang Li
dde588d9b8
Merge changes into stage-aosp-master am: 5dfc4f5e4c
...
am: 77586e8885
2018-09-13 01:16:00 -07:00
Shaotang Li
d4c430149c
Merge changes into stage-aosp-master am: d3cf660391
...
am: 8229800bec
2018-09-13 01:10:22 -07:00
Shaotang Li
77586e8885
Merge changes into stage-aosp-master
...
am: 5dfc4f5e4c
2018-09-13 00:56:38 -07:00
Shaotang Li
8229800bec
Merge changes into stage-aosp-master
...
am: d3cf660391
2018-09-13 00:52:20 -07:00
Android Build Merger (Role)
5dfc4f5e4c
Merge changes into stage-aosp-master
2018-09-13 07:27:15 +00:00
Android Build Merger (Role)
d3cf660391
Merge changes into stage-aosp-master
2018-09-13 07:27:15 +00:00
Benedict Wong
126f4ee3f5
Merge "Use UID as requestID" am: 583f3632e5 am: 0372703a46
...
am: 52bdf5bad9
2018-09-12 16:23:43 -07:00
Benedict Wong
52bdf5bad9
Merge "Use UID as requestID" am: 583f3632e5
...
am: 0372703a46
2018-09-12 15:22:39 -07:00
Benedict Wong
0372703a46
Merge "Use UID as requestID"
...
am: 583f3632e5
Change-Id: Icef3693f5911c8f69076e0990392e28c693cbc22
2018-09-12 14:35:27 -07:00
Andreas Gampe
3697649209
Merge changes into stage-aosp-master am: 2d5b5c704d
...
am: 92b4c652df
2018-09-10 16:22:34 -07:00
Andreas Gampe
9ccf14beb4
Merge changes into stage-aosp-master am: 3e612f3df1
...
am: 711e7a81bd
2018-09-10 16:17:18 -07:00
Andreas Gampe
92b4c652df
Merge changes into stage-aosp-master
...
am: 2d5b5c704d
2018-09-10 16:01:58 -07:00
Andreas Gampe
711e7a81bd
Merge changes into stage-aosp-master
...
am: 3e612f3df1
2018-09-10 15:58:08 -07:00
Android Build Merger (Role)
2d5b5c704d
Merge changes into stage-aosp-master
2018-09-10 22:43:03 +00:00
Android Build Merger (Role)
3e612f3df1
Merge changes into stage-aosp-master
2018-09-10 22:43:03 +00:00
Benedict Wong
6d0cd0b7b6
Use UID as requestID
...
This change makes all requestIDs use the UID of the creator, ensuring
that rekeys always use the same requestID. This also has the nice
property of separating app's resources from each other, and allowing for
identification of which app/UID allocated the resources from
command-line dumps (eg ip xfrm state show)
Bug: 111841561
Test: Updated tests & passing taimen
Change-Id: I4f1eadcdb795766ae4682b15e41727359c52fa38
2018-09-04 14:25:13 -07:00
Benedict Wong
0e2450fddb
Merge "Merge "Use tunnel local/remote addresses in security policies" am: 8424a78b75 am: 6b66877f18" into pi-dev-plus-aosp
...
am: 74fc889c8c
Change-Id: I1c5c03777f1ae8dc3bc08096a06824d99a982738
2018-08-31 11:45:09 -07:00
Benedict Wong
9cdc11d5ef
Merge "Use tunnel local/remote addresses in security policies" am: 8424a78b75
...
am: 6b66877f18
2018-08-31 11:12:55 -07:00
Benedict Wong
6b66877f18
Merge "Use tunnel local/remote addresses in security policies"
...
am: 8424a78b75
Change-Id: Ib245f56807848a7908aca80b2f080073600a7722
2018-08-31 11:01:31 -07:00
Benedict Wong
38e52973d2
Use tunnel local/remote addresses in security policies
...
This patch changes tunnel mode security policies to use the actual
tunnel's local and remote addresses to select the SA.
This prevents the kernel from calling xfrm_get_saddr(), which does a
route lookup, potentially resolving an incorrect saddr.
Bug: 79384676
Test: CTS, IpSecService* tests passing
Change-Id: I8223225e2363a79591a0bb0040aa8619cf84c184
2018-08-30 10:55:02 -07:00
Remi NGUYEN VAN
33ca705a18
Merge "Add DhcpServer" am: e3a0f42e8e am: 7f3130c488
...
am: fb294eb16e
2018-08-28 20:51:09 -07:00
Remi NGUYEN VAN
fb294eb16e
Merge "Add DhcpServer" am: e3a0f42e8e
...
am: 7f3130c488
2018-08-28 20:42:08 -07:00
Remi NGUYEN VAN
7f3130c488
Merge "Add DhcpServer"
...
am: e3a0f42e8e
Change-Id: I4ce2cb61d084b37681e1f5103a4e31d4af1cae3e
2018-08-28 20:32:54 -07:00
Remi NGUYEN VAN
c9fc125bb4
Add DhcpServer
...
This first version can serve discover/request/release, although there
are some small behavior changes with current implementation which will
be addressed later.
Also removes final modifiers on start() and stop() in FdEventsReader, to
allow mocking the methods in tests with the current mockito lib.
Test: Added tests pass, manual: flashed a device using the server
Change-Id: I025366ff7d51c4ba31152af50f3dd2b5e280a54d
2018-08-28 12:50:47 +09:00
Remi NGUYEN VAN
7994a8e9e1
[automerger skipped] Merge "Fix testRegisterUsageCallback failure in setUp" am: 3e4562b391 am: 7026ccd445
...
am: 172c9ae72a
2018-08-17 02:15:34 -07:00
Remi NGUYEN VAN
172c9ae72a
Merge "Fix testRegisterUsageCallback failure in setUp" am: 3e4562b391
...
am: 7026ccd445
2018-08-17 02:02:08 -07:00
Remi NGUYEN VAN
7026ccd445
Merge "Fix testRegisterUsageCallback failure in setUp"
...
am: 3e4562b391
2018-08-17 01:48:48 -07:00
