LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,807 Commits 2 Branches 0 Tags
270197bc8d50205a82092d181f9dbdbdeebb376c
Commit Graph

1807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
junyulai
3da40c4828 Fix negative uid stats caused by 464xlat adjust when eBPF is on. 
When using xt_qtaguid to count per uid stats,
NetworkStatsService needs to adjust the 464xlat traffic since
iptables module would double count for ipv4 and ipv6 packet.
But for eBPF, the per uid stats is collected in a different
hook, so the adjustment on root uid would only be needed in tx
direction.

Bug: 112226716
Test: 1. Make ipv4 traffic in ipv6-only network and check data
         usage.
      2. Make ipv4 traffic in a client which connect to
         ipv6-only hotspot.
      3. runtest frameworks-net
      4. cts-tradefed run cts -m CtsNetTestCases -t \
                 android.net.cts.TrafficStatsTest
      5. cts-tradefed run cts -m CtsUsageStatsTestCases

Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac
Merged-In: Ic9a84f5446eddc943c255d5f3b89dad171f53cac
(cherry picked from commit c33ac0d43b594f6154accf03ae7e3fd34dedc79d)
 2018-11-07 10:16:26 +08:00
Junyu Lai
0ab82da19f Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2 am: a38302f84f 
am: fcb523e095

Change-Id: I9d0d8b67ed0159ba2a71059620ebe5698eb79ccb
 2018-10-30 19:56:01 -07:00
Junyu Lai
fcb523e095 Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2 
am: a38302f84f

Change-Id: I3ee791e4b6fdd9d508807810183dc02c69bd2c0b
 2018-10-30 19:46:18 -07:00
Junyu Lai
a38302f84f Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." 
am: 0d63da86e2

Change-Id: Ia5120619ce7d5cedd6e558ed4d1dc9a706638796
 2018-10-30 19:35:32 -07:00
junyulai
7d412d0b46 Fix negative uid stats caused by 464xlat adjust when eBPF is on. 
When using xt_qtaguid to count per uid stats,
NetworkStatsService needs to adjust the 464xlat traffic since
iptables module would double count for ipv4 and ipv6 packet.
But for eBPF, the per uid stats is collected in a different
hook, so the adjustment on root uid would only be needed in tx
direction.

Bug: 112226716
Test: 1. Make ipv4 traffic in ipv6-only network and check data
         usage.
      2. Make ipv4 traffic in a client which connect to
         ipv6-only hotspot.
      3. runtest frameworks-net
      4. cts-tradefed run cts -m CtsNetTestCases -t \
                 android.net.cts.TrafficStatsTest
      5. cts-tradefed run cts -m CtsUsageStatsTestCases

Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac
 2018-10-30 21:23:38 +08:00
Luke Huang
4f2898674e Merge "Refactor UidRange by using stable aidl structure" am: 55012f2249 am: 96c61c9fa2 
am: 9a3586aa00

Change-Id: I82e06fe93a3ed88368b649ef8d3283322191ffe7
 2018-10-28 18:06:15 -07:00
Luke Huang
9a3586aa00 Merge "Refactor UidRange by using stable aidl structure" am: 55012f2249 
am: 96c61c9fa2

Change-Id: I09ac7fc6525948b76114ef936dc1b3d2d1bae0fb
 2018-10-28 17:55:57 -07:00
Luke Huang
96c61c9fa2 Merge "Refactor UidRange by using stable aidl structure" 
am: 55012f2249

Change-Id: I9ac52f3869fe051d0ef7f45768f1defad155b53b
 2018-10-28 17:44:20 -07:00
Treehugger Robot
55012f2249 Merge "Refactor UidRange by using stable aidl structure" 2018-10-29 00:17:34 +00:00
Olivier Gaillard
7456dd9539 Merge "Update a few runnable/handler to use a static class instead of a runnable." 2018-10-26 08:05:30 +00:00
Xiangyu/Malcolm Chen
4ead2b6b84 [automerger skipped] Merge changes into pi-dev-plus-aosp 
am: ace6d6fc61  -s ours

Change-Id: Id2d191ae22884f4380c087ec2aebe7bbbe180e5c
 2018-10-25 22:52:45 -07:00
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  -s ours

Change-Id: I75b649236c9bc42d627dd79d055e38b26e20fa40
 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  -s ours

Change-Id: Ibe80ad8a60c74e954623c543607573491754cd2e
 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  -s ours

Change-Id: If860aa9619b4655886dfdac1528940e5e30446fe
 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  -s ours

Change-Id: If3b4a8fabee7b9b74e345d59505040e45588f9e7
 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  -s ours

Change-Id: I2c4b9184789a1bdae2cec06e0e72f6c6ca049113
 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  -s ours

Change-Id: I8343d023ec9584b2a592114e51d588a4c67d83e9
 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

Change-Id: I4126f4e184975a387a82ada2b4f432cf20cabbb8
 2018-10-18 09:13:56 -07:00
Chenbo Feng
e6278480b9 Merge "Move bpf project to system/bpf" am: 1006d271cc 
am: d271be0e1c

Change-Id: I9c0592365844836dc644d6e090def32af3edf678
 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  -s ours

Change-Id: Id6f6ea6d0799c4e271be5942379033e1545f7551
 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  -s ours

Change-Id: I22fe06c9597a6e62239b1871ce63f43e6b44ea3a
 2018-10-15 16:24:22 -07:00
chen xu
80eac3b9a4 [automerger skipped] Merge changes into stage-aosp-master 
am: f3f46416d0  -s ours

Change-Id: I14f88c998153e945516840acd7d3fbc765dd3357
 2018-10-15 16:12:40 -07:00
chen xu
d69bec6213 [automerger skipped] Merge changes into stage-aosp-master 
am: d3e9ff8a21  -s ours

Change-Id: I00a27b03ba4c0061bce8c21940abb517aecdc48f
 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

Change-Id: I35976332f9bdec9d45e4e35980eaefeebad4ca4a
 2018-10-15 08:42:40 -07:00
Beverly Tai
9ee031bd16 Merge changes into stage-aosp-master am: 9c8b0b1983 
am: e987fb8e76

Change-Id: Iba66577f1e3c5c952c6ab3a6eb0d74160f280bf6
 2018-10-15 08:37:09 -07:00
Edward Savage-Jones
27c9db4485 Merge changes into stage-aosp-master 
am: 11fcec3846

Change-Id: Ifada0acd374477fc5ecddd7bed8c4dc800cf5fb4
 2018-10-15 08:17:49 -07:00
Beverly Tai
e987fb8e76 Merge changes into stage-aosp-master 
am: 9c8b0b1983

Change-Id: I821951d01aed73f23ace36870362eb0ef875532f
 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

Change-Id: I33046e52ac1c59f755ef30cbf39203d914ed77c6
 2018-10-11 09:32:42 -07:00
Andreas Gampe
ff777148b8 Merge changes into stage-aosp-master am: 6c73f19679 
am: b034526cc5

Change-Id: I30ae82f0c51c2c47474dcfc44de32fea1153a4cf
 2018-10-11 09:26:17 -07:00
Andreas Gampe
40f0c9f3e4 Merge changes into stage-aosp-master 
am: cd6403a396

Change-Id: Iee2f5645cbe6122eececc1f0517175daa5b414ed
 2018-10-11 09:18:51 -07:00
Andreas Gampe
b034526cc5 Merge changes into stage-aosp-master 
am: 6c73f19679

Change-Id: Ic989692175b2763d58d3cbc169919ee24d2ba2d0
 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

Change-Id: I074056f861332835adaed32ad7d43ed36667ffa3
 2018-10-05 12:35:56 -07:00
Igor Murashkin
097535c524 Merge changes into stage-aosp-master am: 3a955b82c1 
am: e577b00935

Change-Id: I89aab101881f2b1d835c8c8814336e714fa9ab17
 2018-10-05 12:17:40 -07:00
Yan Yan
b950e8b81c Merge changes I10c01f2b,Ie05bc535 am: 8e3ad8b525 
am: 7947437af7

Change-Id: I5501ba7eb04493b5de84feaeadb53b57de89e8d2
 2018-10-05 12:13:20 -07:00