Commit Graph

11337 Commits

Author SHA1 Message Date
Tomasz Wasilczyk
99ed3f2a6f Merge "Don't crash Tethering service when WiFi feature is missing" am: 736f8ec55a am: 5278b64768 am: 6b10dc120d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1577289

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48d8cca44619bc78ebe26b8eec2fe4b5174bcd0c
2021-02-18 20:53:51 +00:00
Tomasz Wasilczyk
6b10dc120d Merge "Don't crash Tethering service when WiFi feature is missing" am: 736f8ec55a am: 5278b64768
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1577289

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice05e20436c5bab99e72f61179df055c657cc248
2021-02-18 20:30:16 +00:00
Tomasz Wasilczyk
5278b64768 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
2021-02-18 19:59:26 +00:00
Tomasz Wasilczyk
736f8ec55a Merge "Don't crash Tethering service when WiFi feature is missing" 2021-02-18 18:20:28 +00:00
Treehugger Robot
bdd4e2dbcc Merge "Use networkstack_client instead of aidl_interface" am: 319064f284 am: 8cd484f656 am: 8f356c1608
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bfc10d7d2e8d8f10dd2daac8eb2f3c167ea94cf
2021-02-18 15:48:26 +00:00
Remi NGUYEN VAN
e817bee583 Merge "Deflake CaptivePortalTest mobile data usage" am: 1a16358c36 am: 9b5f78886d am: 0e251f7a8e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1593857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5cdde3f25901ee56165bd8950ce8bbb428a46dc
2021-02-18 15:48:20 +00:00
Treehugger Robot
c2328313c4 Merge "Add tethering-module-sdk build target." am: c4127ef16c am: f6f3456ae7 am: 9b23f59e33
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idce0adc840a9c4f3bf9b8a000a7159eb792371e8
2021-02-18 15:48:13 +00:00
Treehugger Robot
8f356c1608 Merge "Use networkstack_client instead of aidl_interface" am: 319064f284 am: 8cd484f656
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8695d8cc740df456cb1cc9e38dbfdb4432452f7e
2021-02-18 15:28:40 +00:00
Remi NGUYEN VAN
0e251f7a8e Merge "Deflake CaptivePortalTest mobile data usage" am: 1a16358c36 am: 9b5f78886d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1593857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58dfc2fc7cf868c8f6864bd01da5d80cae376bc1
2021-02-18 15:28:32 +00:00
Treehugger Robot
8cd484f656 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
2021-02-18 15:19:50 +00:00
Remi NGUYEN VAN
9b5f78886d 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
2021-02-18 15:18:20 +00:00
Treehugger Robot
9b23f59e33 Merge "Add tethering-module-sdk build target." am: c4127ef16c am: f6f3456ae7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ebd51517170934130e27c28b86f794081cb5198
2021-02-18 14:58:23 +00:00
Treehugger Robot
f6f3456ae7 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
2021-02-18 14:41:00 +00:00
Treehugger Robot
319064f284 Merge "Use networkstack_client instead of aidl_interface" 2021-02-18 13:31:54 +00:00
Remi NGUYEN VAN
1a16358c36 Merge "Deflake CaptivePortalTest mobile data usage" 2021-02-18 13:11:25 +00:00
Treehugger Robot
c4127ef16c Merge "Add tethering-module-sdk build target." 2021-02-18 12:05:46 +00:00
Treehugger Robot
137e40cc1d Merge "Set updateable:false explicitly in apex rules." am: c72a6cae30 am: 89cd911569 am: d201e37561
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1590053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icef31cdc3bbc38b3f1648552caa9a940ff97b526
2021-02-18 10:29:28 +00:00
Maciej Żenczykowski
d957e1e676 ebpf offload - rename PUNT/DROP to TC_PUNT/TC_DROP am: e982f091e1 am: 4248054e08 am: aedd2eacd8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8f9fefdc62f58b9547c8d7b39d9aa1ab784c0bd
2021-02-18 10:29:23 +00:00
Maciej Żenczykowski
c667f5e907 ebpf offload - add support for tethering of ipv4 udp am: e4a726a5c6 am: 1f6bed0155 am: 2ef44d9cef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5d6f075b4453556e62df9cf510af0e4022b7f8e
2021-02-18 10:28:49 +00:00
Treehugger Robot
d201e37561 Merge "Set updateable:false explicitly in apex rules." am: c72a6cae30 am: 89cd911569
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1590053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I073da66ae98c1de75870ba2da1e5504a319902b2
2021-02-18 10:24:59 +00:00
Maciej Żenczykowski
aedd2eacd8 ebpf offload - rename PUNT/DROP to TC_PUNT/TC_DROP am: e982f091e1 am: 4248054e08
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie259ca96bd3e0e693cda96c89825675f0a2879b0
2021-02-18 10:24:50 +00:00
Treehugger Robot
89cd911569 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
2021-02-18 10:16:10 +00:00
Maciej Żenczykowski
4248054e08 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
2021-02-18 10:10:49 +00:00
Maciej Żenczykowski
2ef44d9cef ebpf offload - add support for tethering of ipv4 udp am: e4a726a5c6 am: 1f6bed0155
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib22a34dd4c0f1c072ccb2120eaeda51da79a44a3
2021-02-18 10:10:05 +00:00
Remi NGUYEN VAN
6d190abfe2 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
2021-02-18 18:36:34 +09:00
Treehugger Robot
c72a6cae30 Merge "Set updateable:false explicitly in apex rules." 2021-02-18 09:30:33 +00:00
Maciej Żenczykowski
1f6bed0155 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
2021-02-18 09:24:53 +00:00
Maciej Żenczykowski
6895171a2a Merge "ebpf offload - do L4 header present check earlier" am: 2c0edb112f am: 9b833afa0a am: 63a3a118b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2265f3af2e6c96a88c70c19a1342071a7cdca08
2021-02-18 08:32:31 +00:00
Maciej Żenczykowski
63a3a118b9 Merge "ebpf offload - do L4 header present check earlier" am: 2c0edb112f am: 9b833afa0a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida5efa2217eb8f25eb4a7a7b73b783aa56469e60
2021-02-18 07:52:08 +00:00
Maciej Żenczykowski
9b833afa0a 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
2021-02-18 07:20:12 +00:00
Maciej Żenczykowski
e982f091e1 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
2021-02-18 06:40:33 +00:00
Maciej Żenczykowski
e4a726a5c6 ebpf offload - add support for tethering of ipv4 udp
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6229e33cb219e9acd14f5b880cfa2ea0a34442f4
2021-02-18 06:38:36 +00:00
Maciej Żenczykowski
2c0edb112f Merge "ebpf offload - do L4 header present check earlier" 2021-02-18 06:24:39 +00:00
Maciej Żenczykowski
82ee26be75 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
2021-02-18 06:23:32 +00:00
Remi NGUYEN VAN
54ff562243 Merge "Skip NetworkAgentTest via its runner on R-" am: 561c31906e am: 22bcc4a1cb am: c9877f1959
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6915c854b6c79e27e9d8ba6079df8d9cf70883e
2021-02-18 02:52:21 +00:00
Remi NGUYEN VAN
c9877f1959 Merge "Skip NetworkAgentTest via its runner on R-" am: 561c31906e am: 22bcc4a1cb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I014792c6132eedd5d0785c46608da76752b3cac3
2021-02-18 02:17:22 +00:00
Remi NGUYEN VAN
22bcc4a1cb 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
2021-02-18 01:50:28 +00:00
Remi NGUYEN VAN
561c31906e Merge "Skip NetworkAgentTest via its runner on R-" 2021-02-18 01:30:58 +00:00
Tomasz Wasilczyk
3cbccdb6c3 Don't crash Tethering service when WiFi feature is missing
Bug: 175430552
Test: disable WiFi feature on device with wlan0

Change-Id: Ie8b422ed6e0a0a98eb1c7e6072464859d9083ba5
2021-02-17 15:36:05 -08:00
Mathew Inwood
adfc933979 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
2021-02-16 14:58:27 +00:00
Maciej Żenczykowski
717ad84e6a offload ebpf - introduce 4.14+ ipv4 forwarding programs am: 36867351ec am: f335d68cb8 am: 6224c0e30e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03fe8635ca089f7fab9ddca890599169d38b1441
2021-02-16 08:52:38 +00:00
Jeongik Cha
d05f990649 Use networkstack_client instead of aidl_interface
Bug: 150578172
Test: m
Change-Id: Ib5f28db973eb80942faafe1c1c5ddcaab54bf980
2021-02-16 08:20:12 +00:00
Maciej Żenczykowski
6224c0e30e offload ebpf - introduce 4.14+ ipv4 forwarding programs am: 36867351ec am: f335d68cb8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie736bc216988be768dad0f7229fbc51f4d7cc40e
2021-02-16 08:20:04 +00:00
Maciej Żenczykowski
f335d68cb8 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
2021-02-16 07:42:14 +00:00
Maciej Żenczykowski
36867351ec 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
2021-02-16 05:48:55 +00:00
Maciej Żenczykowski
3a03e10b4a Merge "offload ebpf - do_forward4() - introduce updatetime argument" am: d74918c6d2 am: 623479f329 am: be444669e3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d48503b3c2367271448c928cd0ba357db5e2f6b
2021-02-16 02:24:27 +00:00
Remi NGUYEN VAN
fec1dba7c6 Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ" am: edc9b873d3 am: e051a098ab am: 002dd263d7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585571

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40cac7a7ae9e024cc80a6d2faa524c50fcef2a30
2021-02-16 02:23:52 +00:00
Remi NGUYEN VAN
cddf067d2c Revert "Address comments on aosp/1550755" am: f77bed6d95 am: 01218f193f am: e4ebb44543
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585570

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If637d51fc7cd0109b39f8ea8c8eee8e6705584af
2021-02-16 02:23:51 +00:00
Maciej Żenczykowski
be444669e3 Merge "offload ebpf - do_forward4() - introduce updatetime argument" am: d74918c6d2 am: 623479f329
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I696c7f791dc805b71b13c64cc442675f45803ce9
2021-02-15 13:33:32 +00:00
Maciej Żenczykowski
623479f329 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
2021-02-15 13:02:44 +00:00