Remi NGUYEN VAN
f6c8657ae2
[automerger skipped] Merge "Update sources of Tethering module since it is renamed" am: e2c74e90a9 am: a564d023d0 am: 235097b32b -s ours
...
am skip reason: Change-Id I81e2af0cc3b37af16b03c1288eb0591b7ed65cc4 with SHA-1 e831688645 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iafa62fb991a0d873cfbf981ff482bdb14c2e4dfe
2021-03-15 03:30:36 +00:00
Remi NGUYEN VAN
0cb514881f
[automerger skipped] Merge "Update sources of Tethering module since it is renamed" am: e2c74e90a9 am: a564d023d0 -s ours am: 81bbfaa02d -s ours
...
am skip reason: Change-Id I81e2af0cc3b37af16b03c1288eb0591b7ed65cc4 with SHA-1 e831688645 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6d67e2dd3fb91f427b55b7776195839d24d087c
2021-03-15 03:11:05 +00:00
Remi NGUYEN VAN
235097b32b
Merge "Update sources of Tethering module since it is renamed" am: e2c74e90a9 am: a564d023d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieede28a14ecfca4969eabb8954336ee0e07491c3
2021-03-15 02:48:59 +00:00
Remi NGUYEN VAN
81bbfaa02d
[automerger skipped] Merge "Update sources of Tethering module since it is renamed" am: e2c74e90a9 am: a564d023d0 -s ours
...
am skip reason: Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44e475e25c9327b839d941182b881145d2f8b413
2021-03-15 02:48:31 +00:00
Remi NGUYEN VAN
a564d023d0
Merge "Update sources of Tethering module since it is renamed" am: e2c74e90a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626083
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0796324e5b1f5f38890b655f988c91a496612e1
2021-03-15 02:05:41 +00:00
Remi NGUYEN VAN
e2c74e90a9
Merge "Update sources of Tethering module since it is renamed"
2021-03-15 01:32:47 +00:00
Greg Kaiser
c83707836d
Merge "Add ServiceConnectivityResources to in-process APEX" into sc-dev
2021-03-12 17:05:22 +00:00
Lorenzo Colitti
8e8141871d
Merge "Add a test for upstream selection." am: f427d49541 am: 939d48f96c am: 9f8e962d48
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6211a6124a8b1f642f125c4b93d9986843cebc09
2021-03-12 16:03:20 +00:00
Lorenzo Colitti
ee6d2e8259
Merge "Add a test for upstream selection." am: f427d49541 am: 939d48f96c am: 9bb23d6b44
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I439a25a8952e80cdc9fbd03b6eb881d9c729b204
2021-03-12 16:01:32 +00:00
Lorenzo Colitti
9f8e962d48
Merge "Add a test for upstream selection." am: f427d49541 am: 939d48f96c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1f2430060ba0de9fa4d19fa290b31f114f72b13a
2021-03-12 15:16:49 +00:00
Lorenzo Colitti
9bb23d6b44
Merge "Add a test for upstream selection." am: f427d49541 am: 939d48f96c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I661aa8582ded8e992aabb02b5cc403458e2b1508
2021-03-12 15:14:41 +00:00
Remi NGUYEN VAN
f0f0ccad71
Add ServiceConnectivityResources to in-process APEX
...
The APK was added to the standard APEX, but is missing in the
in-process APEX.
Bug: 182557971
Ignore-AOSP-First: corresponding change is not yet in AOSP
Change-Id: Ibf982ceb5f0fd61c822399e3eeeb1ef5e500604d
Test: m
2021-03-12 15:08:03 +00:00
Lorenzo Colitti
939d48f96c
Merge "Add a test for upstream selection." am: f427d49541
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I891027b54d90fb01784158ec690f3880c5125f42
2021-03-12 14:38:02 +00:00
Lorenzo Colitti
f427d49541
Merge "Add a test for upstream selection."
2021-03-12 14:07:01 +00:00
Lorenzo Colitti
473399ceab
Add a test for upstream selection.
...
Currently, upstream selection is split between the Tethering and
UpstreamNetworkMonitor classes. The UpstreamNetworkMonitor bits
are unit tested, but there are no tests for the interaction of
the two. Add a simple test.
In order to do this, remove the code that controls the
UpstreamNetworkMonitor spy from prepareUsbTethering. This is so
that the new test can call prepareUsbTethering but still rely on
the behaviour of the actual UpstreamNetworkMonitor.
Bug: 173068192
Test: atest TetheringTests
Change-Id: If2ef9af82bc0cbff9172e575ad3d7686e5b492da
2021-03-12 17:59:02 +09:00
Maciej Żenczykowski
39a3d0cc48
Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742 am: 5254c0c243 am: f0424798ce
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I273c010442ac10a5dda26a0c4a1fe8128853bb99
2021-03-12 02:51:43 +00:00
Hungming Chen
53bce978b6
[NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73 am: 129077bd58 am: 5af3ee5da0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia70101a050fd99c3b68c6158706f924b08b4c21c
2021-03-12 02:51:41 +00:00
Maciej Żenczykowski
546e9fa694
Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742 am: 5254c0c243 am: e9aa6a316d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2c0dc2f0c5b93b9cf339ab6a1716ca57c0b49d5
2021-03-12 02:33:10 +00:00
Hungming Chen
7c1973c98d
[NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73 am: 129077bd58 am: 9dba544999
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc33ff9ddc0306bf58df81ff9f6e9756817a1534
2021-03-12 02:33:07 +00:00
Remi NGUYEN VAN
a5cc2cdee5
Merge "Add ServiceConnectivityResources to tethering" into sc-dev
2021-03-12 02:10:20 +00:00
Maciej Żenczykowski
e9aa6a316d
Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742 am: 5254c0c243
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8db0e2be24559a4b7b9ec51452ccb74ef51ae6a6
2021-03-12 01:37:01 +00:00
Maciej Żenczykowski
f0424798ce
Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742 am: 5254c0c243
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I041c6fbd65444d1a01387038e0dfabb6b33944ba
2021-03-12 01:37:01 +00:00
Hungming Chen
5af3ee5da0
[NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73 am: 129077bd58
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d09c8f877c717670cf2e1462ec0146b1a0106dd
2021-03-12 01:37:00 +00:00
Hungming Chen
9dba544999
[NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73 am: 129077bd58
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I63ab27a10a04180ac9faf038350c36ff7aec71fe
2021-03-12 01:37:00 +00:00
Remi NGUYEN VAN
00c3d6fa31
[automerger skipped] Merge "Rename StringNetworkSpecifier to Ethernet" am: ce2ab07074 am: 0594e93b46 -s ours am: 351e44b3c8 -s ours
...
am skip reason: Change-Id Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf with SHA-1 dd128f6ea3 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574523
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf8bee3ea79a819577bfe73771ac2b99b67bf9ad
2021-03-12 01:22:44 +00:00
Maciej Żenczykowski
5254c0c243
Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I846f007b1da04929826d4c687b93d7c3a6f56185
2021-03-12 01:01:39 +00:00
Hungming Chen
129077bd58
[NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I54098527fb72260c01c78d0b49282da4257f4a24
2021-03-12 01:01:36 +00:00
Remi NGUYEN VAN
97f68a1285
[automerger skipped] Merge "Rename StringNetworkSpecifier to Ethernet" am: ce2ab07074 am: 0594e93b46 am: a88f2b694e -s ours
...
am skip reason: Change-Id Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf with SHA-1 dd128f6ea3 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574523
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I845c97360365cc407bd673313177738974cf6114
2021-03-12 00:52:15 +00:00
Remi NGUYEN VAN
351e44b3c8
[automerger skipped] Merge "Rename StringNetworkSpecifier to Ethernet" am: ce2ab07074 am: 0594e93b46 -s ours
...
am skip reason: Change-Id Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf with SHA-1 de9dbf5b3c is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574523
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94caf02b4fb57d35df3dccecc0fd61597021ca52
2021-03-12 00:44:41 +00:00
Remi NGUYEN VAN
a88f2b694e
Merge "Rename StringNetworkSpecifier to Ethernet" am: ce2ab07074 am: 0594e93b46
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574523
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a5f18774319c2cccc8dc92fa03760636e7107d8
2021-03-12 00:26:45 +00:00
Maciej Żenczykowski
3357388742
Merge changes from topic "attach_bpfprog_in_mainline"
...
* changes:
[NFCT.TETHER.15] Attach BPF program in the mainline module
[NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor
2021-03-12 00:21:01 +00:00
Remi NGUYEN VAN
0594e93b46
Merge "Rename StringNetworkSpecifier to Ethernet" am: ce2ab07074
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574523
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7778338f37a592a37d215af63d9cf6578c5407b8
2021-03-12 00:10:08 +00:00
Remi NGUYEN VAN
ce2ab07074
Merge "Rename StringNetworkSpecifier to Ethernet"
2021-03-11 23:51:49 +00:00
Hungming Chen
3dbd4a1cc4
[NFCT.TETHER.15] Attach BPF program in the mainline module
...
Migrate Maze's BPF program attaching and detaching functions from
system/netd/server/OffloadUtils.{c, h} to tethering module.
Test: atest TetheringCoverageTests
Test case #1 :
Enable WiFi hotspot and check tc filters are added or removed on both
wlan1 and rmnet_data#.
$ adb shell tc filter show dev wlan1 ingress
filter protocol ipv6 pref 1 bpf chain 0
filter protocol ipv6 pref 1 bpf chain 0 handle 0x1
prog_offload_schedcls_tether_upstream6_ether:[*fsobj] direct-action
not_in_hw id 2 tag 7cf020cc09a7c982
filter protocol ip pref 2 bpf chain 0
filter protocol ip pref 2 bpf chain 0 handle 0x1
prog_offload_schedcls_tether_upstream4_ether:[*fsobj] direct-action
not_in_hw id 7 tag 2f87d55b636c082c
$ adb shell tc filter show dev rmnet_data2 ingress;
filter protocol ipv6 pref 1 bpf chain 0
filter protocol ipv6 pref 1 bpf chain 0 handle 0x1
prog_offload_schedcls_tether_downstream6_rawip:[*fsobj] direct-action
not_in_hw id 3 tag 8b3885b75bd261de
filter protocol ip pref 2 bpf chain 0
filter protocol ip pref 2 bpf chain 0 handle 0x1
prog_offload_schedcls_tether_downstream4_rawip:[*fsobj] direct-action
not_in_hw id 6 tag b1c9478c91f8df9a
Test case #2 :
Enable USB tethering and check tc filters are added or removed on both
rndis0 and rmnet_data#.
Test case #3 :
Enable WiFi and USB tethering and check tc filter are added or removed
on rndis0, wlan1 and rmnet_data#.
Change-Id: I3f9a65043271bc8f5bf1b82ae505c471625ca9de
2021-03-11 17:49:42 +08:00
Aaron Huang
b401e58a1e
Update sources of Tethering module since it is renamed
...
framework-tethering-shared-srcs is named to
framework-connectivity-shared-srcs so update
source section to include correct file group.
Ignore-AOSP-First: changes in topic has conflicts in sc-dev
Bug: 177046265
Test: FrameworksNetTests
Change-Id: I81e2af0cc3b37af16b03c1288eb0591b7ed65cc4
Merged-In: I81e2af0cc3b37af16b03c1288eb0591b7ed65cc4
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
2021-03-11 07:36:55 +00:00
Sudheer Shanka
55991aa779
Merge "Skipping printing AssumptionViolatedExceptions." am: b94021ab6e am: 188fa60f90 am: bc0bb0fe3f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8351f7d268a40f471c756416d9938f74b4b282f4
2021-03-10 16:42:11 +00:00
Maciej Żenczykowski
112e8687f3
ebpf offload - beginnings of xdp implementation am: 90b81ac174 am: e416c69f76 am: 79c1df6e0e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1622560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I174551f074a2890f81eff79f563671c64def0cbc
2021-03-10 16:42:00 +00:00
Sudheer Shanka
f3774740d1
Merge "Skipping printing AssumptionViolatedExceptions." am: b94021ab6e am: 188fa60f90 am: 391af8dda0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3858650d6c90212384c982a8d916e622d16f712
2021-03-10 15:44:15 +00:00
Maciej Żenczykowski
ceb0a6e7ba
ebpf offload - beginnings of xdp implementation am: 90b81ac174 am: e416c69f76 am: f4404beddc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1622560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ief7ff34243272dceb73e2d3ca8c5e19e45c70851
2021-03-10 15:44:11 +00:00
Maciej Żenczykowski
a016bcc76e
ebpf offload - make it possible to boot on Q era 4.14/4.19 kernels am: acddd4f183 am: 973a01cae3 am: f2c7fe1437
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625739
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I15aee383bddbae250455e1b777793316b78148bf
2021-03-10 15:44:07 +00:00
Maciej Żenczykowski
367437e3a9
ebpf offload - noop program reorder am: 2278aed207 am: 4e071fff2a am: 9009cc521d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625238
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I654ccde88eb64546cecae6087e3e8303108de107
2021-03-10 15:44:05 +00:00
Maciej Żenczykowski
dac9960486
ebpf offload - make it possible to boot on Q era 4.14/4.19 kernels am: acddd4f183 am: 973a01cae3 am: cffaf88a09
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625739
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id44cc26be89deeff4c3f6cb816cf794c9abf25d5
2021-03-10 15:42:55 +00:00
Maciej Żenczykowski
1936456537
ebpf offload - noop program reorder am: 2278aed207 am: 4e071fff2a am: b2dc6cfa40
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625238
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7058b6b5c320e7fbe7071130e373f9e620b15013
2021-03-10 15:42:53 +00:00
Sudheer Shanka
391af8dda0
Merge "Skipping printing AssumptionViolatedExceptions." am: b94021ab6e am: 188fa60f90
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6ff9507d19f0e56258c78d285648fe8d3df6e75c
2021-03-10 14:58:41 +00:00
Maciej Żenczykowski
f4404beddc
ebpf offload - beginnings of xdp implementation am: 90b81ac174 am: e416c69f76
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1622560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib8850fb10af5c8fa80743d51cbc514f67b44ffd0
2021-03-10 14:58:35 +00:00
Sudheer Shanka
bc0bb0fe3f
Merge "Skipping printing AssumptionViolatedExceptions." am: b94021ab6e am: 188fa60f90
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e5bbaf02285a87b9887301227ebe8f91f7d4dd2
2021-03-10 14:58:12 +00:00
Maciej Żenczykowski
79c1df6e0e
ebpf offload - beginnings of xdp implementation am: 90b81ac174 am: e416c69f76
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1622560
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife38a96fd8c76b4d7e6591bb9123135f1d373c98
2021-03-10 14:58:06 +00:00
Maciej Żenczykowski
cffaf88a09
ebpf offload - make it possible to boot on Q era 4.14/4.19 kernels am: acddd4f183 am: 973a01cae3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625739
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c57851d064079ee668b77949e7cade8eefc8238
2021-03-10 14:58:00 +00:00
Maciej Żenczykowski
f2c7fe1437
ebpf offload - make it possible to boot on Q era 4.14/4.19 kernels am: acddd4f183 am: 973a01cae3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625739
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95c85376c218ca29aee62c0aab5cca097cfa298f
2021-03-10 14:57:59 +00:00
Maciej Żenczykowski
b2dc6cfa40
ebpf offload - noop program reorder am: 2278aed207 am: 4e071fff2a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1625238
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47d783a5000bb63ee98886377a577c6229645554
2021-03-10 14:57:58 +00:00