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

92711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
1c77f09ccd Merge Android 14 
Bug: 298295554
Merged-In: Iad740804a59599dd33add1ea85aa4771e0e4bd35
Change-Id: I2b62fe04f57d55a866759acf8a599bdf409d2e84
 2023-10-05 15:42:15 -07:00
Maciej Żenczykowski
147d0d844f Merge "more classic bpf macros" into main am: 0d55be75fd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2773644

Change-Id: Ib65fe5948c699838f62bdb991f610b27ef524670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 18:31:02 +00:00
Maciej Żenczykowski
d8ff1bb42f Merge "more classic bpf macros" into main am: 0d55be75fd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2773644

Change-Id: Ibdc7ee783d63c897396e7ed7d54de180c7496a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 18:28:58 +00:00
Maciej Żenczykowski
0d55be75fd Merge "more classic bpf macros" into main 2023-10-05 18:10:26 +00:00
Treehugger Robot
b3493eea05 Merge "Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest" into main am: 6a5ab05e87 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2774205

Change-Id: I476aa7fc7f839285e7a86596b06a0e4a7dbee316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 07:18:41 +00:00
Treehugger Robot
d17a2a7073 Merge "Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest" into main am: 6a5ab05e87 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2774205

Change-Id: Ibb32d8ee8f8a87c7e81ddee6012d8bd95b7e095e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 07:16:14 +00:00
Treehugger Robot
6a5ab05e87 Merge "Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest" into main 2023-10-05 06:44:32 +00:00
Paul Hu
f286ed5be1 Include A/AAAA records in probing packet 
Per RFC6762#8.1, a host can simultaneously probe for uniqueness
of its "A" record and all its SRV records [RFC6763] in the same
query message. Add a flag to include the A/AAAA records in the
probing packet if necessary.

Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I365a938a6c481df755a0598b175069b94905fa3b
 2023-10-05 14:14:56 +08:00
Motomu Utsumi
aa2f4d839e Add PACKAGE_USAGE_STATS permission to ConnectivityServiceIntegrationTest 
Bug: 303299687
Test: atest
Change-Id: Iad740804a59599dd33add1ea85aa4771e0e4bd35
 2023-10-05 12:23:20 +09:00
Jean Chalard
ddd00cd23a Merge "Remove an NPE in tearDown" into main am: e7b7ceb70d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770460

Change-Id: I017eafbc7dcf191cf6babcd3c43fa89a66546bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 03:07:15 +00:00
Jean Chalard
65df0450d3 Merge "Remove an NPE in tearDown" into main am: e7b7ceb70d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770460

Change-Id: Iae3a8f278aca4627b6fa58e85beee6ef5aeeedbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 03:05:12 +00:00
Jean Chalard
e7b7ceb70d Merge "Remove an NPE in tearDown" into main 2023-10-05 02:44:59 +00:00
Spandan Das
551bb1ea71 Drop path property from cpp filegroup modules 
The value of `path` here should be a no-op in Soong's cpp compile
action. Dropping this property helps bazel migration since Bazel's
filegroup rule does not have a path property.

Test: m libnetworkstatsfactorytestjni libservice-connectivity
Bug: 297405814

Change-Id: I7879224bf6deb12417d92e9a3fa52f58fccac999
 2023-10-04 23:18:46 +00:00
Maciej Żenczykowski
d5bf2061f3 more classic bpf macros 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5c7fd55301cd5aa44502f8481923c86bc49ea914
 2023-10-04 22:41:21 +00:00
Maciej Żenczykowski
266bf6422a TcUtils jni: jobject clazz -> jclass clazz am: f24beefe55 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2772884

Change-Id: Ia279e79e279b53b4c886f493f4e4bcee4305a796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 22:35:18 +00:00
Maciej Żenczykowski
244f20daf4 BpfUtils jni: jobject clazz -> jclass clazz am: b0f8d31e7d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2772904

Change-Id: I7b8af1d79e1bfd701f4bb8ae2ed104701aecdb32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 22:35:14 +00:00
Maciej Żenczykowski
a98078095b TcUtils jni: jobject clazz -> jclass clazz am: f24beefe55 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2772884

Change-Id: I7d9eaf9047a98ad17f57396b326353077bf12f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 22:34:58 +00:00
Maciej Żenczykowski
3f1fd9610a BpfUtils jni: jobject clazz -> jclass clazz am: b0f8d31e7d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2772904

Change-Id: Ife76ca4aed165bb24cb828d880fd8820fa98f9bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 22:34:53 +00:00
Maciej Żenczykowski
9aa2aba0b4 bpf jni: add native_getProgramIdFromCgroup am: 85ac050b35 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768395

Change-Id: I6e31715eb347cf37baa77215df0bcb89e30fdb7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 21:47:39 +00:00
Maciej Żenczykowski
d1e9b19c6c boot time test of queryProgram() am: 5b2611d044 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770966

Change-Id: I1e41bc231f25407accf1fa473ef193e566fabe49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 21:47:35 +00:00
Maciej Żenczykowski
424998180e BpfSyscallWrappers: add queryProgram() am: 340e2ff355 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768161

Change-Id: I7c0775c6b7bd21736f43d906ac17671e37b200f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 21:47:30 +00:00
Maciej Żenczykowski
33f2c63b7d bpf jni: add native_getProgramIdFromCgroup am: 85ac050b35 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768395

Change-Id: I03c32c5cbae45255abaf29a047640311e0f4829c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 21:47:15 +00:00
Maciej Żenczykowski
e6dba23745 boot time test of queryProgram() am: 5b2611d044 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2770966

Change-Id: I204115e00e9e6ee914464efbb5f1f65cc4edef28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 21:47:11 +00:00
Maciej Żenczykowski
6294dedc2a BpfSyscallWrappers: add queryProgram() am: 340e2ff355 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768161

Change-Id: Id80499d297e76e3621882f11b567e85946586e6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 21:47:06 +00:00
Maciej Żenczykowski
f24beefe55 TcUtils jni: jobject clazz -> jclass clazz 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0a06d2627ef06fe4606b3d1a6525af767d218945
 2023-10-04 19:15:53 +00:00
Maciej Żenczykowski
b0f8d31e7d BpfUtils jni: jobject clazz -> jclass clazz 
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3fd51ad129873782b74c7c47b50e16f1f1f0fa6e
 2023-10-04 19:15:44 +00:00
Maciej Żenczykowski
85ac050b35 bpf jni: add native_getProgramIdFromCgroup 
Test: TreeHugger
Bug: 292156770
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib7b194b9cbf6519f9fbcfd1fcefcbe5d825f5c3a
 2023-10-04 19:14:43 +00:00
Maciej Żenczykowski
5b2611d044 boot time test of queryProgram() 
Test: TreeHugger
Bug: 292156770
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6e4527a8cb5b5bfc033c5a4d09f0b78080c163c9
 2023-10-04 19:12:32 +00:00
Maciej Żenczykowski
340e2ff355 BpfSyscallWrappers: add queryProgram() 
Test: TreeHugger
Bug: 292156770
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0f77220a6c4b13efb5630d7a5ade1db39c59901e
 2023-10-04 19:12:25 +00:00
Maciej Żenczykowski
38cd577ed9 Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main am: 99c8a5d1e2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768572

Change-Id: I84417bfd7fcc5f86b86edf2c2640d60a2af45126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 13:47:50 +00:00
Maciej Żenczykowski
bdb923eb96 Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main am: 99c8a5d1e2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2768572

Change-Id: Ib4b6b69bed939ff6472efd4f60dc5950f3a0d2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 13:45:53 +00:00
Maciej Żenczykowski
99c8a5d1e2 Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main 2023-10-04 13:10:54 +00:00
Junyu Lai
9272120c48 Adds more data points for benchmarking tests 
To have better observation of overall improvement, more real
data points from the fields are needed.
This change adds more anonymous data points which are collected
from users who agreed to share the dataset for testing purpose.

Test: atest ConnectivityBenchmarkTests
Bug: 269409485
Change-Id: If7cb1cbb8215e4a4abcbf90c1fdcc141e19ecc44
 2023-10-04 17:37:46 +08:00
Junyu Lai
56b03edede Move test zip file to assets 
This is a no-op refactoring which move test data from resources
to assets, and repacking zip file to contain netstats sub-folder.

This is needed for later patches to put more test data points,
and having easier way to access them in batch.

Test: atest ConnectivityBenchmarkTests
Bug: 269409485
Change-Id: I1d09ac0187c9ce12982161243929d8e10483da45
 2023-10-04 17:24:37 +08:00
Hansen Kurli
78b06ebe84 Make variables in testLegacyLockdownVpn() final. 
Test: atest FrameworksNetTests
Change-Id: Ie852286275f0e377be582648f7766c077d9877e8
 2023-10-04 16:50:05 +08:00
Hansen Kurli
b2764be9b6 Update testLegacyLockdownVpn to mock VPN. 
Override more VPN methods to mock the VPN interaction of
testLegacyLockdownVpn instead of relying on the Vpn class.
This includes:
    1. Overriding startLegacyVpnPrivileged() and avoid creating
       a VpnRunner.
    2. Removing expectStartLegacyVpnRunner() since it is not
       used when startLegacyVpnPrivileged() is overridden.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: Id55d8d6cd03b84bca815cd331eb0f7d584eaed5f
 2023-10-04 16:47:10 +08:00
Hansen Kurli
acb5205558 Remove the fail case on IPv6 in testLockdownVpn 
In testLegacyLockdownVpn, remove the fail check on IPv6 networks
and add coverage in VpnTest instead as this interaction relies
on the Vpn implementation, not ConnectivityService.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: Ib24809ece2332c4c3d3e08c168e02ad859242eac
 2023-10-04 16:45:45 +08:00
Hansen Kurli
35f6fef389 Remove LockdownVpnTracker from testLegacyLockdownVpn 
The test coverage of LockdownVpnTracker has been moved to a
separate unit test file. testLegacyLockdownVpn now calls the Vpn
methods directly instead of creating a new LockdownVpnTracker.
Note this removes calls to expectStopVpnRunnerPrivileged since
stopVpnRunnerPrivileged is now directly called in the test so it
is already guaranteed to be called.

The expected calls/behavior of LockdownVpnTracker can be seen in
LockdownVpnTrackerTest.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: Id9d26435bf62ffef954f6c7fa0558ce99540de1f
 2023-10-04 16:44:09 +08:00
Motomu Utsumi
03be33bd42 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: I5ea1221f7d79bd3b5c6df36980737b8878693451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 07:07:16 +00:00
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