LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,829 Commits 2 Branches 0 Tags
24f46aaa90a360f3574a26da7f99c31c170e82ba
Commit Graph

2829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Automerger Merge Worker
063a508caf [automerger skipped] Merge changes from topic "am-a4c996e50cb34a3bb257f059536b77ae" into rvc-d1-dev-plus-aosp am: 5f93a08607 -s ours 
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 4d3f871a94 is in history

Change-Id: I0ea68069cd9e07bf2d95b14452046fdb63613782
 2020-05-12 21:03:36 +00:00
Automerger Merge Worker
461e330dee Merge "[automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 -s ours am: bd38d29054 -s ours" into rvc-d1-dev-plus-aosp 2020-05-12 20:47:07 +00:00
TreeHugger Robot
b4e067f7b0 [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 -s ours am: bd38d29054 -s ours 
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 4d3f871a94 is in history

Change-Id: I439913a4195cea16832b3ec6c19a3cfaa63dfdb8
 2020-05-12 20:47:02 +00:00
TreeHugger Robot
580791f90a [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 am: 5b624bb023 -s ours 
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 4d3f871a94 is in history

Change-Id: Ib9aaf9091937ae27f35a389cc3de696567cefe1b
 2020-05-12 20:46:55 +00:00
Benedict Wong
13143d325b [automerger skipped] Use TransformRecord to get SPI instead of SpiRecord am: 003c5c9807 am: 7db9e00fe5 -s ours 
am skip reason: Change-Id I1959f3080946267243564459ff4207647922566e with SHA-1 ec2e2e2174 is in history

Change-Id: Id31a417c7a4204bd646400e90456424d12d2d9d0
 2020-05-12 20:46:52 +00:00
TreeHugger Robot
5b624bb023 Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 
Change-Id: Ie0c5a3c7bfc16edf98203212b8a1e7e4e8b302b9
 2020-05-12 20:45:01 +00:00
Benedict Wong
7db9e00fe5 Use TransformRecord to get SPI instead of SpiRecord am: 003c5c9807 
Change-Id: I011543293623240b5652ac9818b0b3f28a397e97
 2020-05-12 20:44:59 +00:00
TreeHugger Robot
f71250552f Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 
Change-Id: I73f7aa761e1377dfed0ab234af4a2bc6a73a91a2
 2020-05-12 20:41:48 +00:00
Benedict Wong
ea5976d350 Use TransformRecord to get SPI instead of SpiRecord am: 003c5c9807 
Change-Id: I4a186a8c098dbad6c0d97d2ee0cdc1a9342b8a19
 2020-05-12 20:41:46 +00:00
TreeHugger Robot
bd38d29054 [automerger skipped] Merge changes I37dd459d,I1959f308 into rvc-dev am: d7aa055b61 -s ours 
am skip reason: Change-Id I37dd459d08b57b14f72f3b28ea80fa231b152f10 with SHA-1 4d3f871a94 is in history

Change-Id: I0b5556bcaa27ca0a379f910bfba80aec506348c9
 2020-05-12 20:41:03 +00:00
TreeHugger Robot
d7aa055b61 Merge changes I37dd459d,I1959f308 into rvc-dev 
* changes:
  Add tests for Tunnel, Transport mode application with released SPIs
  Use TransformRecord to get SPI instead of SpiRecord
 2020-05-12 20:30:03 +00:00
Treehugger Robot
1d4d01a8a8 Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb 
In NetworkStatsService, mStatsLock will be held when
iterating through the provider list. This is to protect the list
from concurrent broadcast that triggered by
NetworkPolicyManagerService. This is not good since the binder
call is oneway, it does not make sense to block every
access to the providers.

This change also remove unuse variable and reduce verbose log.

Test: atest FrameworksNetTests TetheringTests
Bug: 150418178
Change-Id: If74e9f2ea597a0d5ae4668c3358bc687f342bbb5
Merged-In: If74e9f2ea597a0d5ae4668c3358bc687f342bbb5
(cherry picked from commit 5d8f96c6967d5b1a42ba374521078e75a9e6f187)
 2020-05-12 11:36:03 +00:00
Treehugger Robot
e3f3a1d7d8 Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" am: 9aa60f31da am: 23289b2670 am: c146edd88a am: 2d00972cf9 
Change-Id: I01994daf04cca1477777964ad6e40627a48ad169
 2020-05-12 10:52:59 +00:00
Treehugger Robot
2d00972cf9 Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" am: 9aa60f31da am: 23289b2670 am: c146edd88a 
Change-Id: I08aea8c4ace0cde386b4873ab0e1c05dc3128531
 2020-05-12 10:41:50 +00:00
Treehugger Robot
c146edd88a Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" am: 9aa60f31da am: 23289b2670 
Change-Id: Ie188a72163f70c5efc964c03acdae9dac2bbe6cf
 2020-05-12 10:26:04 +00:00
Treehugger Robot
23289b2670 Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" am: 9aa60f31da 
Change-Id: I51dfa3882e33db89d40b9e912d5178096c724de6
 2020-05-12 10:12:56 +00:00
Treehugger Robot
9aa60f31da Merge "Use CopyOnWriteArrayList to store list of NetworkStatsProviderCb" 2020-05-12 09:51:35 +00:00
android-build-team Robot
26943af9aa Snap for 6479434 from 83ebcd435886d7df38f064bd0b45e581f078023e to mainline-release 
Change-Id: I37e4d979cc751c758e52ce04eb6e68faa39c25b6
 2020-05-10 07:11:24 +00:00
android-build-team Robot
6c5ee93463 Snap for 6477313 from 00f681a5827512248c79180a5fdb364f6140a660 to rvc-release 
Change-Id: Ib9ad0f2e587d8fc6f5203b1c589ac135d1489a58
 2020-05-09 01:14:12 +00:00