Bill Yi
7034246041
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 567b439367 -s ours am: 13a634886b -s ours
...
am: f91213f1f5
2018-10-25 21:14:17 -07:00
Bill Yi
42384c6e04
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: ef4374f6a2 -s ours
...
am: 51a3f72bbb
2018-10-25 20:12:57 -07:00
Android Build Merger (Role)
ace6d6fc61
Merge changes into pi-dev-plus-aosp
2018-10-26 02:59:16 +00:00
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
Luke Huang
e67f2178dc
Refactor UidRange by using stable aidl structure
...
Use stable aidl generated structure instead of UidRange
Test: runtest frameworks-net passes
Test: manual testing of UidRange related function works
Change-Id: Iaf1c10777dc1e71df2be2a57533a10257b12626b
2018-10-24 19:45:09 +09:00
Olivier Gaillard
ff57484594
Update a few runnable/handler to use a static class instead of a
...
runnable.
It will help collecting better data for handler stats (we can get a
fully qualified class name).
Test: tested manually
Change-Id: I674cf03909153fd87d97f600e246e04800cbb624
2018-10-24 10:18:35 +01:00
android-build-team Robot
21f01a0e78
Snap for 5087486 from bd1a7fa5c3c00f5c377e1cacc957ac008ddcd1fb to pi-qpr2-release
...
Change-Id: I87f6e9e0a1821eea5e2326c2e3d0bb59ae0236ff
2018-10-24 03:02:21 +00:00
Chalard Jean
2ca6ac1f1c
[automerger skipped] Merge "Delay global alerts by 1s for high thresholds" into pi-dev am: 688358e870 -s ours
...
am: 2d9ee8173a
2018-10-19 03:08:06 -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
9a7e9521fd
Merge "Move bpf project to system/bpf" am: 1006d271cc am: d271be0e1c
...
am: e6278480b9
2018-10-18 09:13:56 -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
6be7d896c1
[automerger skipped] Merge changes into stage-aosp-master am: f3f46416d0 -s ours
...
am: 80eac3b9a4
2018-10-15 16:30:09 -07:00
chen xu
0f9eec5104
[automerger skipped] Merge changes into stage-aosp-master am: d3e9ff8a21 -s ours
...
am: d69bec6213
2018-10-15 16:24:22 -07: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
b9a152c24d
Merge changes into stage-aosp-master am: 11fcec3846
...
am: 27c9db4485
2018-10-15 08:42:40 -07:00
Beverly Tai
9ee031bd16
Merge changes into stage-aosp-master am: 9c8b0b1983
...
am: e987fb8e76
2018-10-15 08:37:09 -07: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
97889fb035
Merge changes into stage-aosp-master am: cd6403a396
...
am: 40f0c9f3e4
2018-10-11 09:32:42 -07:00
Andreas Gampe
ff777148b8
Merge changes into stage-aosp-master am: 6c73f19679
...
am: b034526cc5
2018-10-11 09:26:17 -07: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
7fec7d15d3
Merge changes I10c01f2b,Ie05bc535 am: 8e3ad8b525 am: 7947437af7
...
am: b950e8b81c
2018-10-05 12:35:56 -07:00
Igor Murashkin
097535c524
Merge changes into stage-aosp-master am: 3a955b82c1
...
am: e577b00935
2018-10-05 12:17:40 -07:00
Yan Yan
b950e8b81c
Merge changes I10c01f2b,Ie05bc535 am: 8e3ad8b525
...
am: 7947437af7
2018-10-05 12:13:20 -07:00
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
