Bill Yi
f91213f1f5
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 567b439367 -s ours
...
am: 13a634886b
2018-10-24 19:40:40 -07:00
Bill Yi
51a3f72bbb
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: ef4374f6a2
2018-10-24 17:20:17 -07:00
Bill Yi
13a634886b
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: 567b439367
2018-10-24 17:17:46 -07:00
Bill Yi
567b439367
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: I695db52f5e22509401258e8b083e7650d401d993
2018-10-24 14:48:44 -07:00
Bill Yi
ef4374f6a2
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I13571b072111900d0979f026670e648cdef9899b
2018-10-24 09:08:38 -07:00
Chalard Jean
2d9ee8173a
[automerger skipped] Merge "Delay global alerts by 1s for high thresholds" into pi-dev
...
am: 688358e870 -s ours
Change-Id: I61187439899450e20f4a1fb7490fff202b60be29
2018-10-19 02:58:01 -07:00
Chenbo Feng
e6278480b9
Merge "Move bpf project to system/bpf" am: 1006d271cc
...
am: d271be0e1c
2018-10-18 08:12:41 -07:00
Chenbo Feng
d271be0e1c
Merge "Move bpf project to system/bpf"
...
am: 1006d271cc
Change-Id: I0a96a2abd66fd0cca4b49d773a6990a59134128a
2018-10-17 13:55:43 -07:00
Chenbo Feng
4a259ab940
Move bpf project to system/bpf
...
The bpf project now have a new project directory in system/bpf instead
of inside netd. The network related bpf library is renamed to
libnetdbpf. Fix the dependency issue in framework to make sure no
regression.
Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
Bug: 112334572
Change-Id: Ibd477bf17d18d516aa520fb1569f4a395ef9abf0
2018-10-17 03:46:35 +00:00
Chalard Jean
0a8c58b06b
Delay global alerts by 1s for high thresholds
...
This is a cherry-pick of aosp/735725 with a minor conflict.
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: Ia0ed76141dfb33546529786eb0118138ef3708c2
Merged-In: Ie0ba5c1d1a2139606e63fcfe46ec77a89accd8d9
Merged-In: Iaabb31586e9e747871a526dc7ebb7deeb65d8f83
2018-10-16 08:57:17 +00:00
chen xu
80eac3b9a4
[automerger skipped] Merge changes into stage-aosp-master
...
am: f3f46416d0
2018-10-15 16:12:40 -07:00
chen xu
d69bec6213
[automerger skipped] Merge changes into stage-aosp-master
...
am: d3e9ff8a21
2018-10-15 16:08:29 -07:00
Android Build Merger (Role)
f3f46416d0
Merge changes into stage-aosp-master
2018-10-15 22:44:53 +00:00
Android Build Merger (Role)
d3e9ff8a21
Merge changes into stage-aosp-master
2018-10-15 22:44:53 +00:00
Edward Savage-Jones
27c9db4485
Merge changes into stage-aosp-master
...
am: 11fcec3846
2018-10-15 08:17:49 -07:00
Beverly Tai
e987fb8e76
Merge changes into stage-aosp-master
...
am: 9c8b0b1983
2018-10-15 08:13:53 -07:00
Android Build Merger (Role)
11fcec3846
Merge changes into stage-aosp-master
2018-10-15 15:00:04 +00:00
Android Build Merger (Role)
9c8b0b1983
Merge changes into stage-aosp-master
2018-10-15 15:00:04 +00:00
Andreas Gampe
40f0c9f3e4
Merge changes into stage-aosp-master
...
am: cd6403a396
2018-10-11 09:18:51 -07:00
Andreas Gampe
b034526cc5
Merge changes into stage-aosp-master
...
am: 6c73f19679
2018-10-11 09:13:43 -07:00
Android Build Merger (Role)
cd6403a396
Merge changes into stage-aosp-master
2018-10-11 15:45:44 +00:00
Android Build Merger (Role)
6c73f19679
Merge changes into stage-aosp-master
2018-10-11 15:45:44 +00:00
Yan Yan
b950e8b81c
Merge changes I10c01f2b,Ie05bc535 am: 8e3ad8b525
...
am: 7947437af7
2018-10-05 12:13:20 -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
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
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
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
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
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
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
