Commit graph

8,312 commits

Message SHA1
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity" am: f5b346ed1d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6826bfacba4cad02eca8946b2c16e11b16b4f357

Bob Badour   authored and   Automerger Merge Worker   commited 2021-02-19 06:54:29 +00:00
c384c677ef
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity"
Bob Badour   authored and   Gerrit Code Review   commited 2021-02-19 06:23:22 +00:00
f5b346ed1d
Merge "Add TEST_MAPPING to run CtsHostsideNetworkTests in presubmit." am: ddcfa071ab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19c1fc123f5464300a76ad2c355a99f1176e0788

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2021-02-19 01:41:09 +00:00
cccaa598fc
Merge "Add TEST_MAPPING to run CtsHostsideNetworkTests in presubmit."
Sudheer Shanka   authored and   Gerrit Code Review   commited 2021-02-19 00:33:15 +00:00
ddcfa071ab
Merge "Don't crash Tethering service when WiFi feature is missing" am: 736f8ec55a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1577289

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbef5a2da18394a3baa53ba7267a9324816dd137

Tomasz Wasilczyk   authored and   Automerger Merge Worker   commited 2021-02-18 19:59:26 +00:00
5278b64768
Merge "Don't crash Tethering service when WiFi feature is missing"
Tomasz Wasilczyk   authored and   Gerrit Code Review   commited 2021-02-18 18:20:28 +00:00
736f8ec55a
Merge "Use networkstack_client instead of aidl_interface" am: 319064f284
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a50c8444fbbc0127ec914525c93c9aa83272aeb

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-02-18 15:19:50 +00:00
8cd484f656
Merge "Deflake CaptivePortalTest mobile data usage" am: 1a16358c36
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1593857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb4ce68cb4eb994ac546dcc8d90f0527681ea2ef

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-02-18 15:18:20 +00:00
9b5f78886d
Merge "Add tethering-module-sdk build target." am: c4127ef16c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadb5641cd1450e05b688d3b0afbb019591f12403

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-02-18 14:41:00 +00:00
f6f3456ae7
Merge "Use networkstack_client instead of aidl_interface"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-02-18 13:31:54 +00:00
319064f284
Merge "Deflake CaptivePortalTest mobile data usage"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-02-18 13:11:25 +00:00
1a16358c36
Merge "Add tethering-module-sdk build target."
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-02-18 12:05:46 +00:00
c4127ef16c
Add TEST_MAPPING to run CtsHostsideNetworkTests in presubmit.
We already run these tests when platform code affecting these tests
change. Now enabling these too to also run when these tests are being
changed.

Fixes: 154344933
Test: atest --test-mapping packages/modules/Connectivity/tests/cts/hostside
Change-Id: Ie3ea67670ccd028815936d30189146c25ba87e28

Sudheer Shanka   commited 2021-02-18 11:39:09 +00:00
be82d7d77a
Merge "Set updateable:false explicitly in apex rules." am: c72a6cae30
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1590053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I004236e62753c1a3244c338ceb2639584eabf4a2

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-02-18 10:16:10 +00:00
89cd911569
ebpf offload - rename PUNT/DROP to TC_PUNT/TC_DROP am: e982f091e1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c5f65f0603b131382f66510c8e1f7ed113312fe

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2021-02-18 10:10:49 +00:00
4248054e08
Deflake CaptivePortalTest mobile data usage
The test did not verify that mobile networks were validated before
starting, which could cause them to validate during the test and pick up
the test URLs. Verify that mobile data is validated before the test.

Also shorten test URL expiration, so in case of hard-interrupt of the
test (without calling tearDown) it does not affect other tests for a
long time.

Bug: 178630586
Test: atest CtsNetTestCases
Change-Id: I03f346bcc231f869f50ca9c7e84bfac319bcc871

Remi NGUYEN VAN   commited 2021-02-18 18:36:34 +09:00
6d190abfe2
Merge "Set updateable:false explicitly in apex rules."
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-02-18 09:30:33 +00:00
c72a6cae30
ebpf offload - add support for tethering of ipv4 udp am: e4a726a5c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d12eca24c0041a3916ca8110f7ac54f9474560b

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2021-02-18 09:24:53 +00:00
1f6bed0155
Merge "ebpf offload - do L4 header present check earlier" am: 2c0edb112f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I154915d8db2f7efe6f12ce311d456d0cce59c0c1

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2021-02-18 07:20:12 +00:00
9b833afa0a
ebpf offload - rename PUNT/DROP to TC_PUNT/TC_DROP
because it is not appropriate for use in XDP programs

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

Maciej Żenczykowski   commited 2021-02-18 06:40:33 +00:00
e982f091e1
ebpf offload - add support for tethering of ipv4 udp
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6229e33cb219e9acd14f5b880cfa2ea0a34442f4

Maciej Żenczykowski   commited 2021-02-18 06:38:36 +00:00
e4a726a5c6
Merge "ebpf offload - do L4 header present check earlier"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2021-02-18 06:24:39 +00:00
2c0edb112f
ebpf offload - do L4 header present check earlier
and more importantly unconditionally.  This requires less effort
on the part of the in-kernel bpf verifier.

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

Maciej Żenczykowski   commited 2021-02-18 06:23:32 +00:00
82ee26be75
Merge "Skip NetworkAgentTest via its runner on R-" am: 561c31906e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e6b9705d60c173503812e07cc19b1ec64d12731

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-02-18 01:50:28 +00:00
22bcc4a1cb
Merge "Skip NetworkAgentTest via its runner on R-"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-02-18 01:30:58 +00:00
561c31906e
Don't crash Tethering service when WiFi feature is missing
Bug: 175430552
Test: disable WiFi feature on device with wlan0

Change-Id: Ie8b422ed6e0a0a98eb1c7e6072464859d9083ba5

Tomasz Wasilczyk   commited 2021-02-17 15:36:05 -08:00
3cbccdb6c3
Set updateable:false explicitly in apex rules.
Currently, this is the default so this is a no-op,
But the default is changing to true.

Bug: 180375550
Test: Treehugger
Change-Id: Ib841e474ab2b2ff2b54c160bb06c3bbbeea92675

Mathew Inwood   commited 2021-02-16 14:58:27 +00:00
adfc933979
[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity
Added SPDX-license-identifier-Apache-2.0 to:
  Tethering/Android.bp
  Tethering/apex/Android.bp
  Tethering/bpf_progs/Android.bp
  Tethering/common/TetheringLib/Android.bp
  Tethering/tests/Android.bp
  Tethering/tests/integration/Android.bp
  Tethering/tests/mts/Android.bp
  Tethering/tests/privileged/Android.bp
  Tethering/tests/unit/Android.bp
  tests/cts/hostside/Android.bp
  tests/cts/hostside/aidl/Android.bp
  tests/cts/hostside/app/Android.bp
  tests/cts/hostside/app2/Android.bp
  tests/cts/hostside/certs/Android.bp
  tests/cts/net/Android.bp
  tests/cts/net/api23Test/Android.bp
  tests/cts/net/appForApi23/Android.bp
  tests/cts/net/jni/Android.bp
  tests/cts/net/native/dns/Android.bp
  tests/cts/net/native/qtaguid/Android.bp
  tests/cts/net/util/Android.bp
  tests/cts/tethering/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I8534c580f0e2a17be146300b67b3604817b64507

Bob Badour   commited 2021-02-16 04:09:58 -08:00
97e6be27f6
Use networkstack_client instead of aidl_interface
Bug: 150578172
Test: m
Change-Id: Ib5f28db973eb80942faafe1c1c5ddcaab54bf980

Jeongik Cha   commited 2021-02-16 08:20:12 +00:00
d05f990649
offload ebpf - introduce 4.14+ ipv4 forwarding programs am: 36867351ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79681916c7fa60d76a1721d52a08a7f2b8e22a46

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2021-02-16 07:42:14 +00:00
f335d68cb8
offload ebpf - introduce 4.14+ ipv4 forwarding programs
We've backported the necessary support to all 4.14+ ACK kernels,
but we can't actually enforce that these changes will be picked
up by all devices.  Thus we can only make the full featured
implementations optional on [4.14..5.8) kernels, with a tcp-only
version for those 4.14+ devices where the full featured version
fails to load.

Note: there's still a fair bit of implementation work left
in the do_forward4() function itself.  This is really just
the skeleton.

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

Maciej Żenczykowski   commited 2021-02-16 05:48:55 +00:00
36867351ec
Merge "offload ebpf - do_forward4() - introduce updatetime argument" am: d74918c6d2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35508aa4baa1bdce95bdc2543d60f14eb784e4e4

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2021-02-15 13:02:44 +00:00
623479f329
Merge "offload ebpf - do_forward4() - introduce updatetime argument"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2021-02-15 12:35:16 +00:00
d74918c6d2
offload ebpf - do_forward4() - introduce updatetime argument
This will facilitate providing a tcp-only version of the programs
which due to TCP's very long timeouts will not need to use the
Linux 5.8+ bpf_ktime_get_boot_ns() helpers.

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

Maciej Żenczykowski   commited 2021-02-15 12:33:01 +00:00
aefa0950b5
Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ" am: edc9b873d3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585571

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I099f467447b6773aca92c10699ba845438976fb7

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-02-15 11:52:00 +00:00
e051a098ab
Revert "Address comments on aosp/1550755" am: f77bed6d95
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585570

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fc7b281dc3fa7be8c4a5979b1571d2652c29870

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-02-15 11:51:59 +00:00
01218f193f
tethering offload ebpf - lower requirement from 5.9 to 5.8 am: b0ac41f0cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d8fecaab82002ff4e6eee14adff9d50ea585ea9

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2021-02-15 11:51:41 +00:00
c456856971
Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ"
* changes:
  Revert "[VCN07.1] Add test for bypassing VCN for non-internet re..."
  Revert "Address comments on aosp/1550755"

Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-02-15 11:39:25 +00:00
edc9b873d3
tethering offload ebpf - lower requirement from 5.9 to 5.8
As this is the actual version that is required,
ie. the version that supports bpf_ktime_get_boot_ns() helper.

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

Maciej Żenczykowski   commited 2021-02-14 22:24:34 -08:00
b0ac41f0cd
Add tethering-module-sdk build target.
Bug: 177884752
Test: m tethering-module-sdk
Change-Id: Idd4e6743001a6402f6a5dd6832601b08d7cc0236

Hai Zhang   commited 2021-02-14 06:38:26 +00:00
6d71f109bc
Revert "[VCN07.1] Add test for bypassing VCN for non-internet re..."
Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."

Revert submission 1579872-vcn07

Reason for revert: Possible culprit for b/179768816, broken ConnectivityControllerTest
Reverted Changes:
Id09b19c13:Address comments on aosp/1550755
I245bd69e0:[VCN07.1] Add test for bypassing VCN for non-inter...
I9936894b9:[VCN07] Bypass VCN for non-internet app accessible...

Change-Id: I7902a221c8597427e48d3e32fa5668b9c1a47420

Remi NGUYEN VAN   commited 2021-02-12 06:28:17 +00:00
075da46909
Revert "Address comments on aosp/1550755"
Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."

Revert submission 1579872-vcn07

Reason for revert: Possible culprit for b/179768816, broken ConnectivityControllerTest
Reverted Changes:
Id09b19c13:Address comments on aosp/1550755
I245bd69e0:[VCN07.1] Add test for bypassing VCN for non-inter...
I9936894b9:[VCN07] Bypass VCN for non-internet app accessible...

Change-Id: I3fded28691e05a3dbf25bb7361c72acaa61b29c7

Remi NGUYEN VAN   commited 2021-02-12 06:27:44 +00:00
f77bed6d95
Merge "Load JNI in all classes that have native methods." am: af97e51c01
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1581528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1259c72d124f0d1310c147406026775682d2a7b

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-02-12 05:25:23 +00:00
ceafffa6c0
Merge "fix TetheringCoverageTests" am: 6fc8229f16
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1584755

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89847f05774cb37ec76fd57938d8bcf1e3a4f397

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-02-12 05:24:52 +00:00
31ce8ad94d
Merge changes I71a37663,Ib2010b38 am: fd710547b2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1583023

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefd7946816067ed9279f26e48d86934db54056ce

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-02-12 05:17:01 +00:00
c241c0f4f3
Merge "Load JNI in all classes that have native methods."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2021-02-12 03:19:00 +00:00
af97e51c01
Merge "fix TetheringCoverageTests"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-02-12 03:17:51 +00:00
6fc8229f16
Merge changes I71a37663,Ib2010b38
* changes:
  Improve testing of registerSystemDefaultNetworkCallback.
  Remove buggy ConnectivityManagerTest#ensureWifiConnected.

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2021-02-12 02:45:02 +00:00
fd710547b2
fix TetheringCoverageTests
Test: atest TetheringCoverageTests now passes, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0d83de14784f323400a83ce282cae1a3e7b4b396

Maciej Żenczykowski   commited 2021-02-11 16:06:46 -08:00
c92e8ce636
Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbd2aad92bb7fe3fd09de99d82dbb1178daef43c

Daulet Zhanguzin   authored and   Automerger Merge Worker   commited 2021-02-11 15:05:16 +00:00
c9bee74abd