Commits · a98078095b52c0dcc89a4622d38755c675c84a6d · LMODroid / platform_packages_modules_Connectivity

Oct 04, 2023

TcUtils jni: jobject clazz -> jclass clazz am: · a9807809

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>

a9807809

BpfUtils jni: jobject clazz -> jclass clazz am: · 3f1fd961

Maciej Żenczykowski authored 1 year ago

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>

3f1fd961

bpf jni: add native_getProgramIdFromCgroup am: · 9aa2aba0

Maciej Żenczykowski authored 1 year ago

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>

9aa2aba0

boot time test of queryProgram() am: · d1e9b19c

Maciej Żenczykowski authored 1 year ago

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>

d1e9b19c

BpfSyscallWrappers: add queryProgram() am: · 42499818

Maciej Żenczykowski authored 1 year ago

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>

42499818

TcUtils jni: jobject clazz -> jclass clazz · f24beefe

Maciej Żenczykowski authored 1 year ago


Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0a06d2627ef06fe4606b3d1a6525af767d218945

f24beefe

BpfUtils jni: jobject clazz -> jclass clazz · b0f8d31e

Maciej Żenczykowski authored 1 year ago


Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3fd51ad129873782b74c7c47b50e16f1f1f0fa6e

b0f8d31e

bpf jni: add native_getProgramIdFromCgroup · 85ac050b

Maciej Żenczykowski authored 1 year ago


Test: TreeHugger
Bug: 292156770
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib7b194b9cbf6519f9fbcfd1fcefcbe5d825f5c3a

85ac050b

boot time test of queryProgram() · 5b2611d0

Maciej Żenczykowski authored 1 year ago


Test: TreeHugger
Bug: 292156770
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6e4527a8cb5b5bfc033c5a4d09f0b78080c163c9

5b2611d0

BpfSyscallWrappers: add queryProgram() · 340e2ff3

Maciej Żenczykowski authored 1 year ago


Test: TreeHugger
Bug: 292156770
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0f77220a6c4b13efb5630d7a5ade1db39c59901e

340e2ff3

Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main am: · 38cd577e

Maciej Żenczykowski authored 1 year ago

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>

38cd577e

Merge "cts: fix android.net.cts.VpnServiceTest#testProtect_int flake" into main · 99c8a5d1
Maciej Żenczykowski authored 1 year ago

99c8a5d1

Merge "Remove lint-baseline in staticlibs" into main am: · 03be33bd

Motomu Utsumi authored 1 year ago

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>

03be33bd

Merge "Remove lint-baseline in staticlibs" into main · 30ef5308
Motomu Utsumi authored 1 year ago

30ef5308

Merge "Cleanup existing firewall rule on myUid before the test" into main am: · bbf74da2

Motomu Utsumi authored 1 year ago

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>

bbf74da2

Merge "Cleanup existing firewall rule on myUid before the test" into main · 18520551
Motomu Utsumi authored 1 year ago

18520551

Oct 03, 2023

cts: fix android.net.cts.VpnServiceTest#testProtect_int flake · ee20a09b

Maciej Żenczykowski authored 1 year ago


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

ee20a09b

Merge changes I8f83d042,I3d6a6a07,If088188b,Ia0c1f55a into main am: · 49eeaddf

Treehugger Robot authored 1 year ago

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>

49eeaddf

Merge changes I8f83d042,I3d6a6a07,If088188b,Ia0c1f55a into main · 8cfccc9d

Treehugger Robot authored 1 year ago

* 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'

8cfccc9d

Merge changes Ibadd782d,I8704dccf into main am: · 42c66ae7

Maciej Żenczykowski authored 1 year ago

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>

42c66ae7

Merge "Disable the remaining VPN CTS tests on watches." into main am: · 1032b1c0

Treehugger Robot authored 1 year ago

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>

1032b1c0

Merge changes Ibadd782d,I8704dccf into main · f4a71a11

Maciej Żenczykowski authored 1 year ago

* changes:
  bpf: add constants PRIVATE, SHARED, MANDATORY, OPTIONAL
  switch from defines to static consts

f4a71a11

Merge "Disable the remaining VPN CTS tests on watches." into main · c8a42f6a
Treehugger Robot authored 1 year ago

c8a42f6a

Merge "Prioritize non-slices over slices" into main am: · 98f2f90a

Jean Chalard authored 1 year ago

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>

98f2f90a

Merge "Prioritize non-slices over slices" into main · d393732d
Jean Chalard authored 1 year ago

d393732d

Prioritize non-slices over slices · 14499f01

Chalard Jean authored 1 year ago

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

14499f01

Merge "Remove defaultEnabled arg from isNetworkStackFeatureEnabled" into main am: · 8b3f80c6

Treehugger Robot authored 1 year ago

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>

8b3f80c6

Merge "Remove defaultEnabled arg from isNetworkStackFeatureEnabled" into main · a675e966
Treehugger Robot authored 1 year ago

a675e966

Merge "Remove Ikev2VpnProfile related shims usage" into main am: · 1f47e6f2

Chiachang Wang authored 1 year ago

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>

1f47e6f2

Merge "Remove Ikev2VpnProfile related shims usage" into main · 0509e0da
Chiachang Wang authored 1 year ago

0509e0da

netbpfload: update date in copyright messages, LOG_TAGs, etc. · 283c25a0

Maciej Żenczykowski authored 1 year ago


Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8f83d04266caf930701b9725b457333ddae149f2

283c25a0

netbpfload: remove support for 'loader' · 354ded39

Maciej Żenczykowski authored 1 year ago


Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3d6a6a072cc958c3cb8f49d747a6c6812b37cef5

354ded39

netbpfload: remove support for 'vendor' · d6395205

Maciej Żenczykowski authored 1 year ago


Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If088188b4832d37b084846b5ad3db06b8858d856

d6395205

netbpfload: remove support for 'platform' · 0e4802df

Maciej Żenczykowski authored 1 year ago


Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia0c1f55aa78435737699e0dec0bfddbd977e7392

0e4802df

bpf: add constants PRIVATE, SHARED, MANDATORY, OPTIONAL · c1126293

Maciej Żenczykowski authored 1 year ago


use them & IGNORE_ON_* LOAD_ON_* as needed.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibadd782d289e6a2ce1467778a1930c6f1b609f98

c1126293

switch from defines to static consts · 2387323a

Maciej Żenczykowski authored 1 year ago


tm-mainline-prod is no longer in use

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8704dccff1432ba811e99a89ea60028fd63365b5

2387323a

Merge "import bpfloader into p/m/C" into main am: · 0fd5e55d

Treehugger Robot authored 1 year ago

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>

0fd5e55d

BpfClassic.h - more helpers am: · c1b2eb1f

Maciej Żenczykowski authored 1 year ago

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>

c1b2eb1f

Merge "import bpfloader into p/m/C" into main · 20556ef7
Treehugger Robot authored 1 year ago

20556ef7

Oct 02, 2023

import bpfloader into p/m/C · 60c159f2

Maciej Żenczykowski authored 1 year ago

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

60c159f2