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
Motomu Utsumi
75325831a1 Merge "Remove lint-baseline in staticlibs" into main am: 30ef5308d6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2764845

Change-Id: Idceaa717f88873355e91fed2124e55be66a6efad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 07:05:09 +00:00
Motomu Utsumi
30ef5308d6 Merge "Remove lint-baseline in staticlibs" into main 2023-10-04 06:45:02 +00:00
Motomu Utsumi
bbf74da2b5 Merge "Cleanup existing firewall rule on myUid before the test" into main am: 18520551db 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762791

Change-Id: I02664c27248091212dbfc094b2a8364fbfc2e7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 02:44:40 +00:00
Motomu Utsumi
26229fd5b2 Merge "Cleanup existing firewall rule on myUid before the test" into main am: 18520551db 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762791

Change-Id: Ia13201039eba40885ec2e6298e85265116280fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 02:42:39 +00:00
Motomu Utsumi
18520551db Merge "Cleanup existing firewall rule on myUid before the test" into main 2023-10-04 02:15:06 +00:00
Maciej Żenczykowski
ee20a09bdb cts: fix android.net.cts.VpnServiceTest#testProtect_int flake 
This is written based on observation that
  testStartVpnProfileNoPreviousConsent()
appears to result in the right things happening when running
  adb logcat | egrep --color -i 'Switched from |protect'
ie. it results in:
  I netd    : networkSetProtectDeny(<ctsappuid>) <0.01ms>
  I Vpn     : Switched from android.net.cts to [Legacy VPN]
  I netd    : networkSetProtectAllow(1000) <0.00ms>

Which disallows the CTS uid, and allows AID_SYSTEM.

That in turn appears to be the 'default' state of things.

So this basically copies that logic into tearDown()

Test: atest android.net.cts.{Ikev2VpnTest,VpnServiceTest} --iterations 2
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic9cca56097d78ae48157e808081de2ebb76635e8
 2023-10-03 23:59:20 +00:00
Treehugger Robot
49eeaddfeb Merge changes I8f83d042,I3d6a6a07,If088188b,Ia0c1f55a into main am: 8cfccc9de4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770064

Change-Id: Ia7050bf30714050cda1e14c9d81bc7ff709e12f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:37:16 +00:00
Treehugger Robot
0384a1c841 Merge changes I8f83d042,I3d6a6a07,If088188b,Ia0c1f55a into main am: 8cfccc9de4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770064

Change-Id: Ia253237b4598cec1cdd36d78da5edd00ae5c647c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:35:12 +00:00
Treehugger Robot
8cfccc9de4 Merge changes I8f83d042,I3d6a6a07,If088188b,Ia0c1f55a into main 
* changes:
  netbpfload: update date in copyright messages, LOG_TAGs, etc.
  netbpfload: remove support for 'loader'
  netbpfload: remove support for 'vendor'
  netbpfload: remove support for 'platform'
 2023-10-03 19:02:19 +00:00
Maciej Żenczykowski
42c66ae70a Merge changes Ibadd782d,I8704dccf into main am: f4a71a1101 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2769884

Change-Id: I11dd6d841a8c70011e0d6e6f050f6a2f9687aeb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 17:48:13 +00:00
Treehugger Robot
1032b1c039 Merge "Disable the remaining VPN CTS tests on watches." into main am: c8a42f6a39 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624254

Change-Id: I5999183d5d641ada0e1b477c2edcb73ee2c45d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 17:46:04 +00:00
Maciej Żenczykowski
a3d16e2ddf Merge changes Ibadd782d,I8704dccf into main am: f4a71a1101 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2769884

Change-Id: I80eb3976c62718a23dc8dacda29db4c8a2b4dd9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 17:43:15 +00:00
Treehugger Robot
2b9afa997f Merge "Disable the remaining VPN CTS tests on watches." into main am: c8a42f6a39 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624254

Change-Id: I6afcbc529e973ba37b5b421d027c601a1094cbb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 17:42:36 +00:00
Xinyi Zhou
06be214b1e Merge "[nearby] Fix flakeness in the unit test" into udc-mainline-prod 2023-10-03 17:23:59 +00:00
Maciej Żenczykowski
f4a71a1101 Merge changes Ibadd782d,I8704dccf into main 
* changes:
  bpf: add constants PRIVATE, SHARED, MANDATORY, OPTIONAL
  switch from defines to static consts
 2023-10-03 17:00:52 +00:00
Treehugger Robot
c8a42f6a39 Merge "Disable the remaining VPN CTS tests on watches." into main 2023-10-03 16:39:31 +00:00
Jean Chalard
98f2f90a82 Merge "Prioritize non-slices over slices" into main am: d393732dba 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2760328

Change-Id: Iba848062cefe19639fd104f03cd03d0dfddb634a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 13:13:33 +00:00
Jean Chalard
5a7025b1c4 Merge "Prioritize non-slices over slices" into main am: d393732dba 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2760328

Change-Id: I0370165b259331baec9c08a6600536d95bbf36b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 13:11:13 +00:00
Jean Chalard
d393732dba Merge "Prioritize non-slices over slices" into main 2023-10-03 12:39:11 +00:00
Chalard Jean
14499f0119 Prioritize non-slices over slices 
For general internet access, a specialized slice is generally
not preferable to a non-specialized network.

Test: new test in this patch
Change-Id: I052ce923300566807999b2f20f5911181fb761dd
 2023-10-03 21:30:49 +09:00
Treehugger Robot
8b3f80c6f7 Merge "Remove defaultEnabled arg from isNetworkStackFeatureEnabled" into main am: a675e966b2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749724

Change-Id: I2f52a941e8321ce7aee164417b6251b670039adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 12:26:31 +00:00
Treehugger Robot
a2158d19fc Merge "Remove defaultEnabled arg from isNetworkStackFeatureEnabled" into main am: a675e966b2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749724

Change-Id: I2b58b6903dc3313bcdcd23c36d0557b85cd9c39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 12:23:25 +00:00
Treehugger Robot
a675e966b2 Merge "Remove defaultEnabled arg from isNetworkStackFeatureEnabled" into main 2023-10-03 11:51:32 +00:00
Chiachang Wang
1f47e6f2e6 Merge "Remove Ikev2VpnProfile related shims usage" into main am: 0509e0da16 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2764585

Change-Id: I16a43aff0260fc52488cf18a75732def3cbb9e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 08:16:09 +00:00
Chiachang Wang
5755c8e90a Merge "Remove Ikev2VpnProfile related shims usage" into main am: 0509e0da16 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2764585

Change-Id: I22da9082a21397cc790d79eb7e4c99b12c2eb8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 08:14:09 +00:00
Chiachang Wang
0509e0da16 Merge "Remove Ikev2VpnProfile related shims usage" into main 2023-10-03 07:45:41 +00:00
Chalard Jean
ec0149f1ba Remove an NPE in tearDown 
This is masking an exception in setUp() and makes debugging difficult

Test: treehugger
Change-Id: I8b5b80c4171d45076dd02bab5ff4b6dc81d98086
 2023-10-03 16:01:00 +09:00
Maciej Żenczykowski
283c25a07a netbpfload: update date in copyright messages, LOG_TAGs, etc. 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8f83d04266caf930701b9725b457333ddae149f2
 2023-10-02 22:40:38 -07:00
Maciej Żenczykowski
354ded3926 netbpfload: remove support for 'loader' 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3d6a6a072cc958c3cb8f49d747a6c6812b37cef5
 2023-10-02 22:35:38 -07:00
Maciej Żenczykowski
d6395205bb netbpfload: remove support for 'vendor' 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If088188b4832d37b084846b5ad3db06b8858d856
 2023-10-02 22:35:24 -07:00
Maciej Żenczykowski
0e4802df20 netbpfload: remove support for 'platform' 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia0c1f55aa78435737699e0dec0bfddbd977e7392
 2023-10-02 22:35:03 -07:00
Maciej Żenczykowski
c112629307 bpf: add constants PRIVATE, SHARED, MANDATORY, OPTIONAL 
use them & IGNORE_ON_* LOAD_ON_* as needed.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibadd782d289e6a2ce1467778a1930c6f1b609f98
 2023-10-03 05:30:56 +00:00
Maciej Żenczykowski
2387323a23 switch from defines to static consts 
tm-mainline-prod is no longer in use

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8704dccff1432ba811e99a89ea60028fd63365b5
 2023-10-03 05:15:18 +00:00
Xinyi Zhou
08356f8252 [nearby] Fix flakeness in the unit test 
Test: -m
Ignore-AOSP-First: nearby not in aosp yet
Fix: 302599461
Change-Id: Id438f453893e4e4adbd341ba36c4a0e3d3dbcb4f
 2023-10-02 17:35:04 -07:00
Treehugger Robot
0fd5e55d73 Merge "import bpfloader into p/m/C" into main am: 20556ef70a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2767832

Change-Id: Ie9c3598bf5a22886320810c02dc9ea80a5091651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 00:33:11 +00:00
Maciej Żenczykowski
c1b2eb1fb6 BpfClassic.h - more helpers am: 73df7414f1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770598

Change-Id: Ie53acc11551c897466fa1637c982f2e5c0c2ac69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 00:32:51 +00:00
Treehugger Robot
f67a057e43 Merge "import bpfloader into p/m/C" into main am: 20556ef70a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2767832

Change-Id: Ife12f30911d8534c4b17f9c3a9f6d4d1fe1e4e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 00:31:07 +00:00
Maciej Żenczykowski
36f8e98ba6 BpfClassic.h - more helpers am: 73df7414f1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770598

Change-Id: Ic037084a50bd6e93a99c34acecab1cd1e1bb2e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 00:30:50 +00:00
Treehugger Robot
20556ef70a Merge "import bpfloader into p/m/C" into main 2023-10-03 00:24:25 +00:00
Maciej Żenczykowski
60c159f233 import bpfloader into p/m/C 
These are unmodified files, without history.
Getting these to do something useful will come later.

Generated via:
  cp //system/bpf/bpfloader/bpfloader.rc netbpfload.rc
  cp //system/bpf/bpfloader/BpfLoader.cpp NetBpfLoad.cpp
  cp //system/bpf/libbpf_android/include/libbpf_android.h loader.h
  cp //system/bpf/libbpf_android/Loader.cpp loader.cpp

Change-Id: I1677b899a51e1289a7a9806d6f5c34450b9e7c47
 2023-10-02 14:59:10 -07:00
Maciej Żenczykowski
73df7414f1 BpfClassic.h - more helpers 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie0eb8895c2d887b71ba886735ad106c1118ebeac
 2023-10-02 20:03:41 +00:00
Maciej Żenczykowski
2a138a87bf rename BPF2_REJECT_IF_ANY_BITS_SET -> BPF2_REJECT_IF_ANY_MASKED_BITS_SET am: b900201ffe 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770578

Change-Id: Ice4d7281c82a774ea540dc8dfc9834a30231eb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 19:55:24 +00:00
Maciej Żenczykowski
cb2af635aa rename BPF2_REJECT_IF_ANY_BITS_SET -> BPF2_REJECT_IF_ANY_MASKED_BITS_SET am: b900201ffe 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770578

Change-Id: If6193d7b8281e3baf5c82785a6425ebe93516e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 19:55:09 +00:00
Maciej Żenczykowski
b900201ffe rename BPF2_REJECT_IF_ANY_BITS_SET -> BPF2_REJECT_IF_ANY_MASKED_BITS_SET 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I54a189f0f7b73917aa3fd049fe2eca387aaca250
 2023-10-02 16:09:05 +00:00
Treehugger Robot
fdda860608 Merge "Add method to read trunk stable flag" into main am: f74f42b4c0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2756185

Change-Id: I94b4a1bbecbca7e9a3fd92f9eb98e3dc1d26b32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 14:20:02 +00:00
Treehugger Robot
96bdd26bc7 Merge "Add method to read trunk stable flag" into main am: f74f42b4c0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2756185

Change-Id: Ia7741830fa1335bdef36718f8558d58a95a3e0bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 14:19:44 +00:00
Treehugger Robot
f74f42b4c0 Merge "Add method to read trunk stable flag" into main 2023-10-02 13:17:53 +00:00
Motomu Utsumi
b0f489021b Add method to read trunk stable flag 
aconfig soong modules should be used to read the trunk stable flag.
However they are not available in the mainline branch.
So this CL adds the method to check if the trunk stable flag is enabled
or not by directly reading from DeviceConfig.
It's expected that this does not work correctly if flag value is not
stored in the DeviceConfig.
But for the time being, this method can be used to keep development.
Once the mainline branch supports the aconfig soong modules, method
added by this CL must be removed and java_aconfig_library should be
used instead.

Test: adb shell device_config put android_core_networking \
Test: com.android.net.flags.test_feature true
Test: Compares the value from java_aconfig_library and DeviceConfigUtils
Change-Id: I8e35b33a3201192e940e88f96aad3b2b6685b046
 2023-10-02 19:34:01 +09:00
KH Shi
ef7cb5e58a Merge "Decouple Ipv6UpstreamRule with Ipv6DownstreamRule" into main am: 2a6a7359b7 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2711576

Change-Id: I662a8954de06f524d184eee4a472fe4f2088bdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 06:58:56 +00:00
KH Shi
9f7f268e5d Merge "Decouple Ipv6UpstreamRule with Ipv6DownstreamRule" into main am: 2a6a7359b7 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2711576

Change-Id: I46b48a93f9920b860a036a92152d2eee1c013df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 06:58:36 +00:00