LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,349 Commits 2 Branches 0 Tags
ea37ac73e574372885f28b096255c1b441febe5c
Commit Graph

3349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maciej Żenczykowski
912814eef5 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 am: 394c0003a1 am: fc30c1b04b am: ae83907ce4 am: 164eee7cf5 
Change-Id: I067445d4b712184da693a9cb15c0309fd9f2ff0d
 2020-05-28 10:30:55 +00:00
Maciej Żenczykowski
164eee7cf5 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 am: 394c0003a1 am: fc30c1b04b am: ae83907ce4 
Change-Id: I003400462b333c378b1e1a2e3a3a8f57a691a5cb
 2020-05-28 10:13:38 +00:00
Maciej Żenczykowski
ae83907ce4 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 am: 394c0003a1 am: fc30c1b04b 
Change-Id: Ifb85b0402528da09f4d98939b4e365df010762c7
 2020-05-28 09:51:22 +00:00
Maciej Żenczykowski
9d862381bb NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID 
This should no longer be needed after all the cleanups.

Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I289d935f84b616ed857ef4c5a7427d57c282d00c
Merged-In: I289d935f84b616ed857ef4c5a7427d57c282d00c
 2020-05-28 02:44:20 -07:00
Maciej Żenczykowski
c7d0224c75 NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. 
Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0121a4ac7ee824adc5930bab786d550b2f00b05b
Merged-In: I0121a4ac7ee824adc5930bab786d550b2f00b05b
 2020-05-28 02:44:10 -07:00
Maciej Żenczykowski
5c9097c9e0 NetworkStats - no need for xt_qtaguid clat bw fixups 
This is due to the previous addition of the ip6tables raw PREROUTING
drop rules for incoming ipv6 clat traffic pre-translation to ipv4.

Since we no longer double account, we no longer need these fixups.

Test: atest bpf_module_test clatd_test libbpf_android_test libnetdbpf_test
  netd_integration_test netd_unit_test netdutils_test
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia171b7797cdc99367064d0649bf1293c71579941
Merged-In: Ia171b7797cdc99367064d0649bf1293c71579941
 2020-05-28 02:43:22 -07:00
Maciej Żenczykowski
fc30c1b04b Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 am: 394c0003a1 
Change-Id: If8abb4247759462532cbac6b43bfb8d3202c6e34
 2020-05-28 09:36:05 +00:00
Maciej Żenczykowski
394c0003a1 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 
Change-Id: I7b9ae6590c67f89b023417e511fa823b79ad53b1
 2020-05-28 09:18:16 +00:00
Maciej Żenczykowski
8eb57183e9 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 
* changes:
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple
  fix android.net.NetworkStatsTest#testApply464xlatAdjustments
  NetworkStats - no need for xt_qtaguid clat bw fixups
 2020-05-28 09:04:42 +00:00
Maciej Żenczykowski
e454f35a39 NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID 
This should no longer be needed after all the cleanups.

Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I289d935f84b616ed857ef4c5a7427d57c282d00c
 2020-05-28 01:47:30 -07:00
Maciej Żenczykowski
bfaed04795 NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. 
Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0121a4ac7ee824adc5930bab786d550b2f00b05b
 2020-05-28 01:33:25 -07:00
Automerger Merge Worker
2dcc3f2efe Merge "[automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 -s ours am: 45a9ef6383 -s ours" into rvc-d1-dev-plus-aosp am: 0a18725f01 -s ours am: 4c8efd303c -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 d4ce044ad1 is in history

Change-Id: I9d6157eb889027e21944e27c24496b457da62362
 2020-05-28 08:00:13 +00:00
TreeHugger Robot
d0bcda11ad [automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 am: 089a6e45dc -s ours am: bf8f9ec5bc -s ours am: 823994d5f9 -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 d4ce044ad1 is in history

Change-Id: I71bc2ffcdcb79c6d50ac44870fc758248d270b06
 2020-05-28 07:59:40 +00:00
TreeHugger Robot
d6864bdd09 [automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 am: 089a6e45dc am: e91fd9a5d1 -s ours am: b873d2a5d8 -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 7e81d01799 is in history

Change-Id: I5368ed41ab35620a9c6a70e9f4ab86fbe397b4a2
 2020-05-28 07:59:28 +00:00
Automerger Merge Worker
4c8efd303c Merge "[automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 -s ours am: 45a9ef6383 -s ours" into rvc-d1-dev-plus-aosp am: 0a18725f01 -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 d4ce044ad1 is in history

Change-Id: Ieb397fcd2b20ea056ecbd6338f2650eca796b145
 2020-05-28 07:26:38 +00:00
Maciej Żenczykowski
28aed515f0 NetworkStats - no need for xt_qtaguid clat bw fixups 
This is due to the previous addition of the ip6tables raw PREROUTING
drop rules for incoming ipv6 clat traffic pre-translation to ipv4.

Since we no longer double account, we no longer need these fixups.

Test: atest bpf_module_test clatd_test libbpf_android_test libnetdbpf_test
  netd_integration_test netd_unit_test netdutils_test
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia171b7797cdc99367064d0649bf1293c71579941
 2020-05-28 00:26:17 -07:00
TreeHugger Robot
823994d5f9 [automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 am: 089a6e45dc -s ours am: bf8f9ec5bc -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 d4ce044ad1 is in history

Change-Id: I58d84b1ccad3b716102770cf88842768c0ed0646
 2020-05-28 07:25:53 +00:00
TreeHugger Robot
b873d2a5d8 [automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 am: 089a6e45dc am: e91fd9a5d1 -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 7e81d01799 is in history

Change-Id: I286b533d69e4bc6faed98698b169fc51725183e6
 2020-05-28 07:25:34 +00:00
Automerger Merge Worker
0a18725f01 Merge "[automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 -s ours am: 45a9ef6383 -s ours" into rvc-d1-dev-plus-aosp 2020-05-28 07:06:41 +00:00
TreeHugger Robot
e34270a30d [automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 -s ours am: 45a9ef6383 -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 7e81d01799 is in history

Change-Id: I037af6678f822a955299dbb75897bfa5f3620793
 2020-05-28 07:06:29 +00:00
TreeHugger Robot
bf8f9ec5bc [automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 am: 089a6e45dc -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 7e81d01799 is in history

Change-Id: Icfae270ec371428c1e6bc391098aad0f7c7fc850
 2020-05-28 07:06:24 +00:00
TreeHugger Robot
089a6e45dc Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 
Change-Id: Iec93c761f4f16cc54f21827413485b68fb3f1c77
 2020-05-28 06:52:50 +00:00
TreeHugger Robot
4ae58860e7 Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 
Change-Id: I98f63b032a6fb5f5490b590ac75588facad51778
 2020-05-28 06:52:44 +00:00
TreeHugger Robot
45a9ef6383 [automerger skipped] Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" into rvc-dev am: f2b96fb045 -s ours 
am skip reason: Change-Id I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428 with SHA-1 7e81d01799 is in history

Change-Id: I28154da3f37d182efd5b65c4c1169690f50e5731
 2020-05-28 06:52:33 +00:00
Maciej Żenczykowski
d4ce044ad1 NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats 
Test: atest bpf_module_test clatd_test libbpf_android_test libnetdbpf_test
  netd_integration_test netd_unit_test netdutils_test
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428
Merged-In: I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428
 2020-05-28 01:57:37 +00:00
Maciej Żenczykowski
619360595f Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" am: 3febc2c0d0 am: f9c7d0b463 am: d5d0cff90c am: caf31937f9 am: 1cade6c0be 
Change-Id: I4c62f60ca4fc031786519247159d68cf6bd0b181
 2020-05-28 01:43:56 +00:00
Maciej Żenczykowski
1cade6c0be Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" am: 3febc2c0d0 am: f9c7d0b463 am: d5d0cff90c am: caf31937f9 
Change-Id: Icb5ad0b9deb9aecb395000b01cbc8b72471807b3
 2020-05-28 01:29:29 +00:00
Maciej Żenczykowski
caf31937f9 Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" am: 3febc2c0d0 am: f9c7d0b463 am: d5d0cff90c 
Change-Id: Ic66bacf81b029613a11aac0a87c325cd71dae4f6
 2020-05-28 01:12:47 +00:00
Maciej Żenczykowski
d5d0cff90c Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" am: 3febc2c0d0 am: f9c7d0b463 
Change-Id: I89254b745961a6372985cc6cc651756d41a9c1b7
 2020-05-28 01:11:29 +00:00
Maciej Żenczykowski
f9c7d0b463 Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" am: 3febc2c0d0 
Change-Id: I66ee156163937fd9dad330a51f73c09eb0fe76b6
 2020-05-28 00:58:07 +00:00
Maciej Żenczykowski
3febc2c0d0 Merge "NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats" 2020-05-28 00:42:17 +00:00
Maciej Żenczykowski
7e81d01799 NetworkStatsService - xt_qtaguid non-ebpf - account stacked interface stats 
Test: atest bpf_module_test clatd_test libbpf_android_test libnetdbpf_test
  netd_integration_test netd_unit_test netdutils_test
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I297fcad0a83bd8c32c0fa6c6a77d83b42cd8c428
 2020-05-27 23:26:26 +00:00
android-build-team Robot
7c415dd66c Snap for 6492800 from 6688c811a265ea3266644833db6298a5cdb799ee to rvc-release 
Change-Id: Ic6ac3408ca5355a7009e665dad35e2073651c391
 2020-05-14 01:03:05 +00:00
android-build-team Robot
cce4b8167c Snap for 6489494 from 73817bc8997d03370d42be20dbb095cf3759d9d5 to mainline-release 
Change-Id: I04ac11c5af37d8f50972dde8bbf99ac173964fc2
 2020-05-13 07:02:59 +00:00
Junyu Lai
d4a09dae0e [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce -s ours am: 64ee3d39fa -s ours am: 53b70927a5 -s ours am: e3ab0f0ebb -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 1d4d01a8a8 is in history

Change-Id: Ib032dec218eeab7dece7483ffc0ef9fb693fcc51
 2020-05-13 01:32:40 +00:00
Junyu Lai
40d57a6c68 [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce am: 84ffb10e8e -s ours am: b04a04fda3 -s ours am: f2f701a90c -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 1d4d01a8a8 is in history

Change-Id: I3fa36e98d55d1b4d34979e98ac072e629e5a82ff
 2020-05-13 01:29:53 +00:00
Junyu Lai
73a1e34f40 [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce am: 84ffb10e8e am: aa9321b114 -s ours am: f013dba5c2 -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 a6880d0037 is in history

Change-Id: I2d4f1196d8f74b1592ba5456bb6458f335ff0272
 2020-05-13 01:29:31 +00:00
Junyu Lai
e3ab0f0ebb [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce -s ours am: 64ee3d39fa -s ours am: 53b70927a5 -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 1d4d01a8a8 is in history

Change-Id: Id2884dc616c1b6ac15315eacaa02d04d47cc2752
 2020-05-13 01:17:41 +00:00
Junyu Lai
f2f701a90c [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce am: 84ffb10e8e -s ours am: b04a04fda3 -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 1d4d01a8a8 is in history

Change-Id: Ic9390ada90e2dc2aae5920ee988c7765106dd49a
 2020-05-13 01:16:41 +00:00
Junyu Lai
f013dba5c2 [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce am: 84ffb10e8e am: aa9321b114 -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 a6880d0037 is in history

Change-Id: I9000677fa68021af9315791e93e9e51c30496a33
 2020-05-13 01:16:30 +00:00
android-build-team Robot
df3731afd3 Snap for 6488384 from 7cf3ea0f2bc94301bfd0871dc574a3dd64b3a086 to rvc-release 
Change-Id: Iadc36ba1ffaa6e9b6ce1d266b3af59a48eb2b9fc
 2020-05-13 01:13:36 +00:00
Junyu Lai
53b70927a5 [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce -s ours am: 64ee3d39fa -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 1d4d01a8a8 is in history

Change-Id: I908caa2274b0bb6ede86ed86910f6141d201fa6e
 2020-05-13 01:02:59 +00:00
Junyu Lai
b04a04fda3 [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce am: 84ffb10e8e -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 a6880d0037 is in history

Change-Id: I3a6b61ea27bad16507e6df44e01d1cbd8a5eeedf
 2020-05-13 01:01:37 +00:00
Junyu Lai
7bffb8a79f Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce 
Change-Id: Ibd4e8f4591495895f611dcf737eaea3024ea00ee
 2020-05-13 00:49:35 +00:00
Junyu Lai
64ee3d39fa [automerger skipped] Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce -s ours 
am skip reason: Change-Id If74e9f2ea597a0d5ae4668c3358bc687f342bbb5 with SHA-1 a6880d0037 is in history

Change-Id: I2ee29a01a22b0299993b99835fe8a18a6c1f364c
 2020-05-13 00:49:16 +00:00
Junyu Lai
84ffb10e8e Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev am: 358fe14bce 
Change-Id: I0ca2a7c58fbf151aa191a874e3a29a14f0ba3149
 2020-05-13 00:49:12 +00:00
Junyu Lai
358fe14bce Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" into rvc-dev 2020-05-13 00:42:42 +00:00
Automerger Merge Worker
1ddde8812b Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 -s ours am: bd38d29054 -s ours" into rvc-d1-dev-plus-aosp am: 461e330dee -s ours am: 343e1fcbff -s ours 
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 e696390fee is in history

Change-Id: I64a603abfab86adf99ee30417e1b11566f1b563a
 2020-05-12 22:36:51 +00:00
Automerger Merge Worker
685ff21f5e [automerger skipped] Merge changes from topic "am-a4c996e50cb34a3bb257f059536b77ae" into rvc-d1-dev-plus-aosp am: 5f93a08607 -s ours am: 063a508caf -s ours 
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 4d3f871a94 is in history

Change-Id: Id6a067912a46cbed8201da3a9057d183017740d3
 2020-05-12 22:32:41 +00:00
Automerger Merge Worker
343e1fcbff Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 -s ours am: bd38d29054 -s ours" into rvc-d1-dev-plus-aosp am: 461e330dee -s ours 
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 e696390fee is in history

Change-Id: Ie3884e88a5e1b7e8997da346c7984a6bf02b186f
 2020-05-12 21:04:43 +00:00