LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92,672 Commits 2 Branches 0 Tags
dbf8d3025e55ba8eb1c5c9899c7c2d9f98ff302c
Commit Graph

92672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chalard Jean
eb66389d6a Allow for mocking an SDK in the tests 
Test: in followup patches
Change-Id: I540ce2a455c92be52eb94fbd4b54a2081d04d25e
 2023-10-10 14:57:22 +09:00
Maciej Żenczykowski
af11354ba5 Merge "Use libbase properties for a slight simplification." into main 2023-10-10 05:56:01 +00:00
Jean Chalard
e3bfadb824 Merge "Expose the netd mock in CSTest to allow verifying calls on it" into main am: 4dec273ab4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775658

Change-Id: I7463e8b960aba0346eeaec399d3c31dc7a612a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 04:45:55 +00:00
Jean Chalard
3f1ef8721a Merge "Add missing copyright notices to tests" into main am: e339c6b780 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775657

Change-Id: I05724882a4820db75cca16baf4280948f0d69be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 04:45:37 +00:00
Jean Chalard
4dec273ab4 Merge "Expose the netd mock in CSTest to allow verifying calls on it" into main 2023-10-10 04:17:29 +00:00
Jean Chalard
e339c6b780 Merge "Add missing copyright notices to tests" into main 2023-10-10 04:16:52 +00:00
Treehugger Robot
88a64da5fc Merge changes I163e21fd,I1b0943d3,I3af8e7f1 into main am: 962ac591bc 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2776077

Change-Id: I4b69888e8b032768eb8019dad0dd073e205b153c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 03:56:01 +00:00
Xiao Ma
175d2b59a4 Merge "Move the delegated prefix validity check to IaPrefixOption class." into main am: a1eb2e453f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777291

Change-Id: I49c51cf143719b2ddc4d852eee5d2ae7c9133b56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 03:55:45 +00:00
Treehugger Robot
962ac591bc Merge changes I163e21fd,I1b0943d3,I3af8e7f1 into main 
* changes:
  netbpfload: remove support for limiting program types
  netbpfload: remove non-network program types
  netbpfload: add Android.bp file
 2023-10-10 03:52:05 +00:00
Xiao Ma
a1eb2e453f Merge "Move the delegated prefix validity check to IaPrefixOption class." into main 2023-10-10 03:27:35 +00:00
Elliott Hughes
497e3e05a5 Use libbase properties for a slight simplification. 
Test: treehugger
Change-Id: If699230d0bf71ce521d7175da707e42b78ae4886
 2023-10-09 23:57:48 +00:00
Krzysztof Kosiński
947c03644f Merge "Clean up obsolete aliases for Truth." into main am: 22d08770af 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2776858

Change-Id: Ic697196794b26f068ea61f1a743ac2891d6cf200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 23:39:13 +00:00
Krzysztof Kosiński
22d08770af Merge "Clean up obsolete aliases for Truth." into main 2023-10-09 23:08:57 +00:00
Maciej Żenczykowski
b41794b0f4 Merge changes Ib48cc2b8,I3f0a12f1 into main am: 2c2c707d6c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2778286

Change-Id: I6693145c236c1db086e2e6cad1815ffc6d00db82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 18:22:54 +00:00
Maciej Żenczykowski
2c2c707d6c Merge changes Ib48cc2b8,I3f0a12f1 into main 
* changes:
  type safety for is_ethernet
  type safety for 'bool egress'
 2023-10-09 17:23:32 +00:00
Treehugger Robot
15f2d41759 Merge changes If33414ec,I8f211e47,If05c0c53 into main am: ae0971b4ae 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2776122

Change-Id: I1b9ac063d1dbc8c2d38f7ddb0da9811aaefc4caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 15:01:58 +00:00
Treehugger Robot
ae0971b4ae Merge changes If33414ec,I8f211e47,If05c0c53 into main 
* changes:
  netd.c: factor out get_app_permissions()
  bpf_progs: use macros for kernel version
  type safety for kernel version
 2023-10-09 14:39:54 +00:00
Maciej Żenczykowski
fcea70f840 netbpfload: remove support for limiting program types 
No need for this, as we simply only support network
program types in the first place.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I163e21fd4d4089882cf37fc68bc4299003b514d7
 2023-10-09 00:32:36 -07:00
Maciej Żenczykowski
02519f86ad netbpfload: remove non-network program types 
We are unlikely to ever be willing to load these
program types from mainline, as it is simply too dangerous.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1b0943d39b8131699f4606e8d165f3c944d453ed
 2023-10-09 00:32:31 -07:00
Maciej Żenczykowski
40dfe53313 netbpfload: add Android.bp file 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3af8e7f14de8dd5dd65c40705195332bef114b88
 2023-10-09 00:32:26 -07:00
Maciej Żenczykowski
8d3bde7949 type safety for is_ethernet 
(reversing logic, as 'rawip.rawip' is much shorter then 'ethernet.ethernet')

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib48cc2b889e8b587e14edbe89606f887a884af87
 2023-10-08 20:16:59 -07:00
Maciej Żenczykowski
a8852b2488 type safety for 'bool egress' 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3f0a12f139478bc94d351d58a08d4a9bd19fa320
 2023-10-08 20:16:59 -07:00
Kangping Dong
b8deae76db Merge "[mdns] exclude mDNS advertiser code from standalone build test" into main am: 4a8977c452 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2760326

Change-Id: I754b410a99f0eb57436b7f925c2aa731a1714c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-08 13:00:38 +00:00
Kangping Dong
4a8977c452 Merge "[mdns] exclude mDNS advertiser code from standalone build test" into main 2023-10-08 12:21:24 +00:00
Kangping Dong
1a1beee654 [mdns] exclude mDNS advertiser code from standalone build test 
service-connectivity-mdns-standalone-build-test builds the mDNS
discovery and advertisement implementation against API level 21.
This stops the advertisement code from calling new NsdServiceInfo
public or private APIs which are required by Thread.

This commit removes the mDNS advertisement code from the standalone
build to loose the check given this will never be used by GMS Core.

Bug: 265095929
Test: verified that it can build with aosp/2608627
Change-Id: I32cfce7b994d51a4b4ec468e9f79ffc2be6635ff
 2023-10-08 17:22:14 +08:00
Xiao Ma
fac8a33763 Move the delegated prefix validity check to IaPrefixOption class. 
Bug: 260934173
Test: TH
Change-Id: Idc6e32f8dbaf3b0e3c57eff496a006fafee02b5e
 2023-10-08 14:33:25 +09:00
Maciej Żenczykowski
dadf98a50e type safety for bool ignore_on_{eng,user,userdebug} am: 6dec6e9374 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775544

Change-Id: I085db833bc4b59ec0730f0010edb1e7c894b2f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 20:53:01 +00:00
Maciej Żenczykowski
e1ff370666 type safety for bool optional am: f2466ef4bb 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775543

Change-Id: I18ad017da20eaedb11fcfad72a854b0af87d5c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 20:52:57 +00:00
Maciej Żenczykowski
9c3c19199c type safety for bool shared am: a262bd3d1e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775542

Change-Id: Ie18d93d99a9ea6a38bcfaeb21b29c19c1e918622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 20:52:54 +00:00
Maciej Żenczykowski
f060849988 netd.c: factor out get_app_permissions() 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If33414eccefb35e6aefbd4ec0c24b208e564ca7e
 2023-10-07 19:38:48 +00:00
Chalard Jean
ff7edd36eb Expose the netd mock in CSTest to allow verifying calls on it 
Test: manual
Change-Id: Ib39dc4dbf534f14d94923bb0026f18e47edabba2
 2023-10-07 15:11:40 +09:00
Chalard Jean
52afbf2634 Add missing copyright notices to tests 
Test: comment-only change
Change-Id: I63bada891757d7e991cc7538c56e4fc50074ee5d
 2023-10-07 15:09:21 +09:00
Maciej Żenczykowski
198eadb402 move BPF_CGROUP_INET*_BIND registration into BpfHandler am: 3cb494fd28 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2773186

Change-Id: I50f2dffd176e5a0767af313c067d7404ab277b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 01:09:36 +00:00
Krzysztof Kosiński
739ed22507 Clean up obsolete aliases for Truth. 
Bug: 255714762
Test: presubmit
Change-Id: If91e9af5409fed9d5ccdd13749a0f562c545d589
 2023-10-07 00:48:10 +00:00
Maciej Żenczykowski
bcf35ccecc move PRIVATE/SHARED/MANDATORY/OPTIONAL/{LOAD,IGNORE}_ON_* into core headers am: 10da6d4e61 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777124

Change-Id: I5195e0d3e1503b2fe59dd215e81f612aee1b89c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:01:54 +00:00
Maciej Żenczykowski
4638a8b464 use static const instead of #define (DIS)ALLOW am: a09c2bbe49 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777123

Change-Id: Ifc1bf719fe8e2a3cfca76023fc94299afab3e949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:01:46 +00:00
Maciej Żenczykowski
84509d668c BpfClassic.h - add missing commas am: 1e32277fff 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777122

Change-Id: I6e22e9474a8bd8e1a528af78222e4b96732b761e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:01:38 +00:00
Maciej Żenczykowski
901c71051e bpf_progs: use macros for kernel version 
Generated via:
  for f in bpf_progs/{block,dscpPolicy,netd,offload,test}.c; do
    sed -i -r 's@KVER[(]([45]), ([0-9]+), 0[)]@KVER_\1_\2@g' "${f}"
  done

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8f211e47bf259fc75aa1caaaf82f41c1929ceab2
 2023-10-06 15:54:39 -07:00
Maciej Żenczykowski
3a64568abb type safety for kernel version 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If05c0c5383dceeb65964143f5574d2ee1a484907
 2023-10-06 15:54:38 -07:00
Maciej Żenczykowski
6dec6e9374 type safety for bool ignore_on_{eng,user,userdebug} 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia85e16d1a7f8d1b21e4ce4c306db6bbea06138e0
 2023-10-06 14:57:12 -07:00
Maciej Żenczykowski
f2466ef4bb type safety for bool optional 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6f10395ca6f1c73f3513031f561fdf1b1dedf451
 2023-10-06 14:48:43 -07:00
Maciej Żenczykowski
a262bd3d1e type safety for bool shared 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4883eab734f47522fec718f0709475f7e6dd0a53
 2023-10-06 14:46:11 -07:00
Maciej Żenczykowski
3cb494fd28 move BPF_CGROUP_INET*_BIND registration into BpfHandler 
(in preparation for moving it into netbpfload)

The programs themselves (in bpf_progs/block.c) required a 5.4+ kernel.

We relax this restriction to 4.19+ as we don't have any 5.4 device coverage
(while the pixel 4a 5G / 5 / 5a are all 4.19 devices).

I believe we could relax it further to 4.14+ but Pixel 4/4xl/4a that
would exercise those code paths are EOL and probably have poor to
non existent test coverage, and we cannot do anything for 4.9 T devices
anyway.

Note: on <4.19 kernels (ie. T devices running 4.9/4.14, U running 4.14)
this results in ConnectivityNativeService going from null to initialized
(as the bpf map will exist).

This doesn't hurt as the set/clear port interfaces are only ever
called by vendor code on devices where the kernel doesn't support
the older mechanism.  And even if you call them it will just set/clear
the bits in the bpf bitmap, they just won't actually affect anything.

We could flag the map itself as being 4.19+ as well, but I think
I prefer the no-op map to exist...

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1085addd22f4f3b709e1875049633832c5dac836
 2023-10-06 14:31:20 -07:00
Maciej Żenczykowski
10da6d4e61 move PRIVATE/SHARED/MANDATORY/OPTIONAL/{LOAD,IGNORE}_ON_* into core headers 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7053ab46e73b763f64f36baf5e7ab64b62421045
 2023-10-06 14:25:41 -07:00
Maciej Żenczykowski
a09c2bbe49 use static const instead of #define (DIS)ALLOW 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1b38f6ac0f511c07610a6afec616e6ec880d8905
 2023-10-06 14:08:50 -07:00
Maciej Żenczykowski
1e32277fff BpfClassic.h - add missing commas 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ife32fa36808de13c5f37ace497395dcc381ca336
 2023-10-06 13:50:13 -07:00
Treehugger Robot
66b9e63e32 [automerger skipped] Merge "Add aconfig_declarations for flags in android_core_networking" into main am: 0565803e5e -s ours 
am skip reason: Merged-In I4870fbe882ce0ec995dcaeb8a2624071fee6dce7 with SHA-1 9ee37a0e60 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2774213

Change-Id: I63e361d1b3e5c45e7882ec251c9d52a3b17ec20f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 12:24:34 +00:00
Motomu Utsumi
bb6df2ecbf [automerger skipped] Add aconfig_declarations for flags in android_core_networking am: e63d38ff37 -s ours 
am skip reason: Merged-In I4870fbe882ce0ec995dcaeb8a2624071fee6dce7 with SHA-1 9ee37a0e60 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2774213

Change-Id: I125409aa7191bb3c8e9daa791c7cfb92ce86ee76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 12:24:29 +00:00
Treehugger Robot
0565803e5e Merge "Add aconfig_declarations for flags in android_core_networking" into main 2023-10-06 12:02:37 +00:00
Motomu Utsumi
e63d38ff37 Add aconfig_declarations for flags in android_core_networking 
Add aconfig_declarations so that platform code can use this flag.
Following CLs(aosp/2606670) use this flag to sync the mainline behavior
change and platform behavior change.
Having merged-in to avoid being merged to udc-mainline-prod where
aconfig soong targets are not supported

Bug: 267870186
Test: TH
Merged-In: I4870fbe882ce0ec995dcaeb8a2624071fee6dce7
Change-Id: I2260dc3d60689da9328fe4f98c3f3048d96bbf6d
 2023-10-06 20:10:20 +09:00