Commit Graph

11220 Commits

Author SHA1 Message Date
Lorenzo Colitti
c0cdf4c0dc Merge "offload - finish ipv4 tethering" am: 4431655a4d am: 76a663683c am: 29f8e3550b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1562765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93b9040903b96f79144cb591677fed22fa9edafc
2021-02-09 13:54:08 +00:00
Lorenzo Colitti
29f8e3550b Merge "offload - finish ipv4 tethering" am: 4431655a4d am: 76a663683c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1562765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386c9e5230fb978856437a9afc0b3920edfcf051
2021-02-09 13:00:08 +00:00
Lorenzo Colitti
76a663683c Merge "offload - finish ipv4 tethering" am: 4431655a4d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1562765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcf60768a4c5c88657f7a3f6896e14082353735a
2021-02-09 12:33:26 +00:00
Lorenzo Colitti
4431655a4d Merge "offload - finish ipv4 tethering" 2021-02-09 11:08:06 +00:00
Lorenzo Colitti
e2cecc4349 Improve BPF tethering counters. am: 72ec3ba88a am: 66609d3f3e am: b9b629f273
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic04ac7bf95106f5f1b02ae360f4b90da68fe7e5a
2021-02-09 07:50:47 +00:00
Lorenzo Colitti
b9b629f273 Improve BPF tethering counters. am: 72ec3ba88a am: 66609d3f3e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19117620a162ecf6a3c14118cebf3413ffbe667b
2021-02-09 07:06:44 +00:00
Lorenzo Colitti
66609d3f3e Improve BPF tethering counters. am: 72ec3ba88a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43e2306bf134e2219b9f0a5bb59ad9c03f3aaa70
2021-02-09 06:27:17 +00:00
Maciej Żenczykowski
3e6764900e Merge changes I3fcd7eb8,I4bf2c762 am: d46b3d8ef8 am: 0681ae3e9a am: 79079db8af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b105b58eb6d19f6d6b2f2120530ecd16df6a259
2021-02-09 05:02:26 +00:00
Maciej Żenczykowski
79079db8af Merge changes I3fcd7eb8,I4bf2c762 am: d46b3d8ef8 am: 0681ae3e9a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I187698dad1d3bf8641e7b9987be3e6e4aeba55b5
2021-02-09 04:25:48 +00:00
Maciej Żenczykowski
0681ae3e9a Merge changes I3fcd7eb8,I4bf2c762 am: d46b3d8ef8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I828f5f2200becadfd0429dce83dc9e4c0bc5d224
2021-02-09 03:43:01 +00:00
Lorenzo Colitti
72ec3ba88a Improve BPF tethering counters.
Test: m
Change-Id: I53961e1e16bf90d76f16b9416c55b65e8374373d
2021-02-09 03:36:40 +00:00
Treehugger Robot
acf3792680 Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" am: 1259762383 am: 81d26e80ed am: 189842e956
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41eaa4e3d419298b70c8e17b01043342f7ac0769
2021-02-09 03:18:46 +00:00
Maciej Żenczykowski
d46b3d8ef8 Merge changes I3fcd7eb8,I4bf2c762
* changes:
  Add error counters for various failures.
  Add a bpf_tethering_headers lib used by the programs and JNI.
2021-02-09 02:57:24 +00:00
Lorenzo Colitti
b81584dbe5 Add error counters for various failures.
Currently, debugging the tethering programs is not easy because
in case of any failure they simply return TC_ACT_OK. This CL adds
a number of counters that the program can increment in the case
of interesting events such as malformed packets.

At the moment the counters are stored in a global tethering error
map, which is an ARRAY map of 32-bit counters. This should not
take up much space because there are only a dozen of these.

We might not need all of these counters. In future CLs we can
reduce the number of counters, or perhaps move them to a map of
maps so as to have separate counters on a per-interface basis.

Test: manual
Change-Id: I3fcd7eb8d318700092949ff2f39987bf4ba3656c
2021-02-09 02:56:52 +00:00
Treehugger Robot
189842e956 Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" am: 1259762383 am: 81d26e80ed
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90d63b555e28dd8d6f5c1f61add882e4016610c9
2021-02-09 02:16:30 +00:00
Lorenzo Colitti
734b14e07d Add a bpf_tethering_headers lib used by the programs and JNI.
This provides a place to store common definitions that can be
used by both the programs and by JNI code in the tethering
module.

Over time much of the tethering-specific code in bpf_shared.h
could move here.

Test: m
Bug: 177884581
Change-Id: I4bf2c762d61cd5db003d59880e6bf7d107ff1a07
2021-02-09 01:54:52 +00:00
Treehugger Robot
81d26e80ed Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" am: 1259762383
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41cb852c962e219c0e546040af29e13c535909b3
2021-02-09 01:21:39 +00:00
Treehugger Robot
1259762383 Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" 2021-02-09 00:13:46 +00:00
Junyu Lai
eae05b4583 Merge changes from topic "vcn07" am: 438f787ca3 am: dfb0a4ffc0 am: 8d02b4ad8c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8cabe55144533c15be90895d416b129eb3c9c75
2021-02-08 22:37:06 +00:00
Junyu Lai
8d02b4ad8c Merge changes from topic "vcn07" am: 438f787ca3 am: dfb0a4ffc0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide6e0198012615169f3343d409e2a02fa39f1569
2021-02-08 22:23:17 +00:00
Junyu Lai
dfb0a4ffc0 Merge changes from topic "vcn07" am: 438f787ca3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8faa712a970474d958136e5f992ba61a290f9516
2021-02-08 22:09:55 +00:00
Junyu Lai
438f787ca3 Merge changes from topic "vcn07"
* changes:
  Address comments on aosp/1550755
  [VCN07.1] Add test for bypassing VCN for non-internet request
2021-02-08 21:40:09 +00:00
junyulai
349deb8e15 Temporarily disable flaky testRequestBackgroundNetwork CTS test
Test: TH
Bug: 179554972
Change-Id: If82d561231b74e8cd0d220431ac83d08e8f16cdd
2021-02-08 21:48:13 +08:00
junyulai
5ceb5c3c8f Address comments on aosp/1550755
This CL bypass adding NOT_VCN_MANAGED on R device. And add TODOs
for refactoring and adding test coverage.

Test: atest CtsNetTestCasesLatestSdk:NetworkRequestTest on R device
Bug: 175662146

Change-Id: Id09b19c13f9a74e25d45689d2211418172dfaec8
2021-02-08 08:52:28 +00:00
Sudheer Shanka
2432bdfa92 [automerger skipped] Update meteredness of cellular networks for tests. am: 8247993e00 am: 0ae458ce93 am: 9e007eab35 -s ours
am skip reason: Change-Id Id70856dffc920e74bda28583dba4dd851a832397 with SHA-1 9e441af03a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cc9bb947e669a0350540b96ffe055580cd52c4b
2021-02-08 06:33:04 +00:00
Sudheer Shanka
9e007eab35 Update meteredness of cellular networks for tests. am: 8247993e00 am: 0ae458ce93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I906ebb4a34aff51355bdd91895aab7ac790ffb5c
2021-02-08 05:57:40 +00:00
Sudheer Shanka
0ae458ce93 Update meteredness of cellular networks for tests. am: 8247993e00
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3880ff751623a7c51c80ece150666d2e68945396
2021-02-08 05:18:44 +00:00
Sudheer Shanka
8247993e00 Update meteredness of cellular networks for tests.
This would allow us to run both metered and unmetered networkpolicy
related tests when the device is on a cellular network.

Bug: 165343126
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsHostsideNetworkTests:HostsideNetworkCallbackTests
Change-Id: Id70856dffc920e74bda28583dba4dd851a832397
Merged-In: Id70856dffc920e74bda28583dba4dd851a832397
2021-02-07 23:29:08 +00:00
Sudheer Shanka
48cf7f07a4 Merge "Update meteredness of cellular networks for tests." into sc-dev 2021-02-07 19:08:50 +00:00
Martin Stjernholm
423a270abb Revert "Don't crash Tethering service when WiFi feature is missing" am: 199641d451 am: b329062b20 am: b9e5c3b247
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I786ef0fee68b2e4310b45b63cd54286f8a168a3f
2021-02-05 15:50:01 +00:00
Martin Stjernholm
b9e5c3b247 Revert "Don't crash Tethering service when WiFi feature is missing" am: 199641d451 am: b329062b20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56f5136bd9cc4f7527c3600b9a307bcd7ec9f33c
2021-02-05 15:01:25 +00:00
Martin Stjernholm
b329062b20 Revert "Don't crash Tethering service when WiFi feature is missing" am: 199641d451
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5c0fadf93627d48507660d4c54dc27c0d6047ae
2021-02-05 14:21:13 +00:00
Martin Stjernholm
199641d451 Revert "Don't crash Tethering service when WiFi feature is missing"
This reverts commit f6a1052f4e.

Reason for revert: Suspected reason for TetheringTests breakage
Bug: 179467044

Change-Id: I3a5ee621b32145b74a31d6c3e411bd789e395935
2021-02-05 11:47:48 +00:00
Sudheer Shanka
9e441af03a Update meteredness of cellular networks for tests.
This would allow us to run both metered and unmetered networkpolicy
related tests when the device is on a cellular network.

Bug: 165343126
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsHostsideNetworkTests:HostsideNetworkCallbackTests
Ignore-AOSP-First: Handling merge-conflict
Change-Id: Id70856dffc920e74bda28583dba4dd851a832397
2021-02-05 07:11:23 +00:00
junyulai
ea79aa6fd9 [VCN07.1] Add test for bypassing VCN for non-internet request
Test: atest NetworkRequestTest#testBypassingVcnForNonInternetRequest
Bug: 175662146
Change-Id: I245bd69e02866d3608ab1667b665f6e12860037b
2021-02-05 10:09:09 +08:00
Tomasz Wasilczyk
dfb58b501b Don't crash Tethering service when WiFi feature is missing am: f6a1052f4e am: 75c7cb992a am: 86be613c85
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9aa310a0b58b466514c5c73485093dafaa6e883
2021-02-04 15:21:00 +00:00
Tomasz Wasilczyk
86be613c85 Don't crash Tethering service when WiFi feature is missing am: f6a1052f4e am: 75c7cb992a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a57e832b8c9700fce7b935bd5caf01b10eeb5ae
2021-02-04 15:02:56 +00:00
Tomasz Wasilczyk
75c7cb992a Don't crash Tethering service when WiFi feature is missing am: f6a1052f4e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I638c438118b5749137d9c389e2cc6161b83d26af
2021-02-04 14:45:10 +00:00
Tomasz Wasilczyk
f6a1052f4e Don't crash Tethering service when WiFi feature is missing
Bug: 175430552
Test: disable WiFi feature on device with wlan0

Change-Id: I83012013ff6a276d9a5c70748b726289b007cb0a
2021-02-02 16:11:18 +00:00
Lucas Lin
f7a4835001 Merge "Add NetdStaticLibTestsLib into TetheringCoverageTests" am: c0bae3c8c5 am: 09193eba96 am: a4863a3491
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I051cda3ccf5b2e5fa75392e75510603575420d99
2021-02-02 05:09:17 +00:00
Lucas Lin
a4863a3491 Merge "Add NetdStaticLibTestsLib into TetheringCoverageTests" am: c0bae3c8c5 am: 09193eba96
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id61cfe8a61a7e74739770d621afdbf87cbdc5000
2021-02-02 04:41:37 +00:00
Lucas Lin
09193eba96 Merge "Add NetdStaticLibTestsLib into TetheringCoverageTests" am: c0bae3c8c5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d1522a732c456fc43d7f30d90bb237491fc6761
2021-02-02 04:18:57 +00:00
Lucas Lin
c0bae3c8c5 Merge "Add NetdStaticLibTestsLib into TetheringCoverageTests" 2021-02-02 03:38:37 +00:00
Junyu Lai
e2ab8d52f3 Merge "[VCN06.1] Add CTS for request background network" am: fa8d845a6e am: abae927467 am: 0519dd2437
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4fc62fc58d55f3151bd18a646b34f5041a2354b
2021-01-29 23:36:41 +00:00
Junyu Lai
0519dd2437 Merge "[VCN06.1] Add CTS for request background network" am: fa8d845a6e am: abae927467
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia117d1e7f6229adef27e5fc2c41c049c06ec96b5
2021-01-29 23:21:03 +00:00
Junyu Lai
abae927467 Merge "[VCN06.1] Add CTS for request background network" am: fa8d845a6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c4f9d68c9f0ddfcc60514b85380764dbe2f1a93
2021-01-29 22:46:27 +00:00
Junyu Lai
fa8d845a6e Merge "[VCN06.1] Add CTS for request background network" 2021-01-29 11:02:02 +00:00
Junyu Lai
38b5855ff7 [VCN06.1] Add CTS for request background network
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork
Bug: 175662146

Change-Id: Icd7d2bc18c4b328291e96fc3f18828d0421f5b6e
2021-01-29 14:34:38 +08:00
Maciej Żenczykowski
ec5f67d97e offload - finish ipv4 tethering
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I88f14938c7c4f66190a3afa2acd9104284e27927
2021-01-27 17:54:07 -08:00
Sudheer Shanka
f0ba6291b1 Check and skip certain operations if they are unsupported.
Fixes: 178334463
Test: com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testMeteredNetworkAccess_expeditedJob
Ignore-AOSP-First: Expedited jobs are not available in AOSP yet
Change-Id: Ie68e17063454e7feeffc93b20b1b8fbb276e837f
2021-01-27 23:18:18 +00:00