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
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
Treehugger Robot
2b03d6d469
Merge "Dump BPF offload rules for upstream IPv4 and IPv6." am: 0f7f9b6e40 am: 959cc0be9f am: 24ee1bb6a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560404
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I013f36607aad1c3eab54aee8ed4526e26018129f
2021-01-27 08:50:39 +00:00
Treehugger Robot
8012b42407
Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0 am: 99d1eeebff am: b33e05d475
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5556e301146b8fc2a70f535b034f490853a690ea
2021-01-27 08:50:01 +00:00
Remi NGUYEN VAN
578098e526
Merge "Move connectivity-sources to frameworks/base" am: f0be057728 am: 9014776664 am: bc2cb208f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552319
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e4c3de8b9978b6d7731b176de32568cf852ca8e
2021-01-27 08:49:37 +00:00
Treehugger Robot
24ee1bb6a0
Merge "Dump BPF offload rules for upstream IPv4 and IPv6." am: 0f7f9b6e40 am: 959cc0be9f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560404
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11f2ca833264943c0bab575c90b6d6ba7aca78e7
2021-01-27 08:28:28 +00:00
Treehugger Robot
b33e05d475
Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0 am: 99d1eeebff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb398ac4c2eb1dcbd13391b06f6277c1a671e540
2021-01-27 08:28:04 +00:00
Remi NGUYEN VAN
bc2cb208f3
Merge "Move connectivity-sources to frameworks/base" am: f0be057728 am: 9014776664
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552319
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I76299a18360a7a94c0861b70faa32a811f5f553b
2021-01-27 08:27:55 +00:00
Treehugger Robot
959cc0be9f
Merge "Dump BPF offload rules for upstream IPv4 and IPv6." am: 0f7f9b6e40
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560404
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99ec4cfef0190254f15ffd0b655c441542325720
2021-01-27 08:00:33 +00:00
Treehugger Robot
99d1eeebff
Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If041c4a7e87d7b33fa192f1e11abf986ace7df3f
2021-01-27 08:00:18 +00:00
Remi NGUYEN VAN
9014776664
Merge "Move connectivity-sources to frameworks/base" am: f0be057728
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552319
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a369158ac3754c47966fa94cb040043573ee2d4
2021-01-27 07:50:14 +00:00
Treehugger Robot
0f7f9b6e40
Merge "Dump BPF offload rules for upstream IPv4 and IPv6."
2021-01-27 07:23:55 +00:00
Treehugger Robot
33848955b0
Merge "merge Tether{Down,Up}stream6Value -> Tether6Value"
2021-01-27 07:18:35 +00:00
Remi NGUYEN VAN
f0be057728
Merge "Move connectivity-sources to frameworks/base"
2021-01-27 07:15:05 +00:00
Maciej Żenczykowski
7dfbcf58d2
merge Tether{Down,Up}stream6Value -> Tether6Value
...
Test: atest TetheringTests TetheringCoverageTests
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Ibdbba9ef6652dd11bb18eba316045dff440fcf9e
2021-01-27 06:41:59 +00:00
Lorenzo Colitti
61976f278f
Dump BPF offload rules for upstream IPv4 and IPv6.
...
Add code to BpfCoordinator to dump upstream IPv4 and IPv6 rules.
For IPv4, currently only the upstream map is printed, because the
downstream map is expected to be symmetrical.
Example output:
=============
21(21) -> 12(rmnet_data2) 86dd 00:00:00:00:00:00 00:00:00:00:00:00
[wlan1]: iif(iface) oif(iface) v6addr srcmac dstmac
12(rmnet_data2) 21(wlan1) /2001:240:2425:b5dc:21a9:995d:bc57:bc37 b2:b5:e0:24:21:c2 ca:06:8d:54:99:ad
[IPv4]: iif(iface) oif(iface) src nat dst
21(21) 12(rmnet_data2) 192.168.16.247:41544 -> 100.101.80.108:41544 -> 216.239.36.135:443
21(21) 12(rmnet_data2) 192.168.16.247:42028 -> 100.101.80.108:42028 -> 8.8.4.4:853
21(21) 12(rmnet_data2) 192.168.16.247:42032 -> 100.101.80.108:42032 -> 8.8.4.4:853
21(21) 12(rmnet_data2) 192.168.16.247:42042 -> 100.101.80.108:42042 -> 8.8.4.4:853
21(21) 12(rmnet_data2) 192.168.16.247:41816 -> 100.101.80.108:41816 -> 8.8.8.8:853
21(21) 12(rmnet_data2) 192.168.16.247:42040 -> 100.101.80.108:42040 -> 8.8.4.4:853
=============
Also make it possible to do "dumpsys tethering bpf" and get only
the BPF dump.
Test: manual
Change-Id: I2aaa2fdda7d724994090c26feff585f24cd3283b
2021-01-27 14:30:51 +09:00
Lorenzo Colitti
1ae9762100
Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415 am: 51875f6043 am: 798f4b0e56
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560403
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8709e14b191c55f9a650edf6dc87a84a8f5449d6
2021-01-27 04:28:11 +00:00
Maciej Żenczykowski
52c0a7f446
fix comments am: cff64c8561 am: ec92651a11 am: 08a003ab33
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6ed98e10a8873c6b5e86072964783313ba9de7e2
2021-01-27 04:26:17 +00:00
Lorenzo Colitti
eec343935b
Add an isEmpty convenience method to BpfMap. am: 77262cea76 am: 63585e9630 am: bb226600c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560402
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a5d933ebce3974a10a8c859b964e3f649bdd7c1
2021-01-27 04:14:29 +00:00
Lorenzo Colitti
57553791e8
Address a TODO in BpfMapTest. am: 7bf39e56e1 am: b62a70bcd2 am: a350221089
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560401
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I867b1d0bc8d64a81c64d1909d5657e2166d1c327
2021-01-27 04:14:24 +00:00
Lorenzo Colitti
b9602938ef
Program the upstream IPv6 map in BpfCoordinator. am: 5b1ed508cf am: e9eb340e3e am: 8c49368ee2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557099
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb815ed4eb9a1d84b4b306aa6ab96d382c816a68
2021-01-27 04:14:23 +00:00
Lorenzo Colitti
1ba4be9119
Rename TetherDownstream6Value to Tether6Value. am: d69a886235 am: 6482088003 am: 80ede0e4d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560395
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb7a49618a6f16053d51429d7183595f2fb2209c
2021-01-27 04:14:21 +00:00
Lorenzo Colitti
798f4b0e56
Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415 am: 51875f6043
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560403
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia3c2de8b5fe3f64fba280e2637a8d9e9d3e0ea40
2021-01-27 04:11:05 +00:00
Lorenzo Colitti
51875f6043
Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560403
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I747667f004d2b13fe25789beaf9d6c9101c39692
2021-01-27 03:38:36 +00:00
Lorenzo Colitti
0913a7a415
Merge changes Iaac422d7,Ia7638b31
...
* changes:
Remove IpServer.Dependencies#getIfIndex.
Address comments on aosp/1559686.
2021-01-27 03:04:23 +00:00
Maciej Żenczykowski
08a003ab33
fix comments am: cff64c8561 am: ec92651a11
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9fc86e6049d847fbb3f0af8eddb455539d83fa37
2021-01-27 01:36:46 +00:00
Lorenzo Colitti
bb226600c1
Add an isEmpty convenience method to BpfMap. am: 77262cea76 am: 63585e9630
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560402
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I61adb34e62da8862b50a56c27dfee5cd78b705b6
2021-01-27 01:36:07 +00:00
Lorenzo Colitti
a350221089
Address a TODO in BpfMapTest. am: 7bf39e56e1 am: b62a70bcd2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560401
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If988eb90c7be8176ffa13f0be425428ce4ae7e8a
2021-01-27 01:36:06 +00:00
Lorenzo Colitti
8c49368ee2
Program the upstream IPv6 map in BpfCoordinator. am: 5b1ed508cf am: e9eb340e3e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557099
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I563a8f0d7013a0d6572f90f0dd6c9c165ba89207
2021-01-27 01:36:05 +00:00
Lorenzo Colitti
80ede0e4d9
Rename TetherDownstream6Value to Tether6Value. am: d69a886235 am: 6482088003
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560395
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a949d07a8a1e353030c0957462f20ee3a38ab7b
2021-01-27 01:36:04 +00:00
Maciej Żenczykowski
ec92651a11
fix comments am: cff64c8561
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I638c660af1b79ef7bec03601f07ef0c336fdcc0b
2021-01-27 01:15:15 +00:00
Lorenzo Colitti
63585e9630
Add an isEmpty convenience method to BpfMap. am: 77262cea76
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560402
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41ee1a37f33950d725c3349a149eaa6c6ce2c355
2021-01-27 01:15:03 +00:00
Lorenzo Colitti
b62a70bcd2
Address a TODO in BpfMapTest. am: 7bf39e56e1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560401
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I67a0daacefa9b648a6ba5d18726c60efecf4e215
2021-01-27 01:15:02 +00:00
Lorenzo Colitti
e9eb340e3e
Program the upstream IPv6 map in BpfCoordinator. am: 5b1ed508cf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557099
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I39f2b2a1863e8fab3deb7756d9301a1cf1754353
2021-01-27 01:15:00 +00:00
Lorenzo Colitti
6482088003
Rename TetherDownstream6Value to Tether6Value. am: d69a886235
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560395
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a15cf070e2faa159e66577df5de3dc6aa171df8
2021-01-27 01:14:57 +00:00
Maciej Żenczykowski
cff64c8561
fix comments
...
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Ic217e08484c39077bcc408195daa3311ed93ad28
2021-01-26 16:45:21 -08:00
Lorenzo Colitti
f3b201f819
Remove IpServer.Dependencies#getIfIndex.
...
This code is unused.
Test: atest TetheringTests
Change-Id: Iaac422d72e8538b67798cb3ae3737deb7b426401
2021-01-27 00:53:59 +09:00
Lorenzo Colitti
51c1a95c82
Address comments on aosp/1559686.
...
Also remove some unnecessary line wrapping.
Test: atest TetheringTests
Change-Id: Ia7638b3198d7811cdbb34e959c50608cf1a656bf
2021-01-27 00:53:59 +09:00
Lorenzo Colitti
77262cea76
Add an isEmpty convenience method to BpfMap.
...
Test: new unit test
Change-Id: Ibec09f328e24111aee4760af2f75ea5a80ba84c3
2021-01-27 00:53:56 +09:00
Lorenzo Colitti
7bf39e56e1
Address a TODO in BpfMapTest.
...
Test: test-only change
Change-Id: I9a47234979cbb161dfcd0c97c54c0476aa753c5e
2021-01-27 00:53:02 +09:00
Lorenzo Colitti
5b1ed508cf
Program the upstream IPv6 map in BpfCoordinator.
...
- Add methods to start and stop IPv6 forwarding upstream
- Populate the upstream IPv6 map when the first rule for any
upstream/downstream pair is created.
- Clear the upstream IPv6 map when the last rule for any
upstream/downstream pair is deleted.
Test: Added coverage to IpServerTest and BpfCoordinatorTest
Change-Id: Ib041081e95f5f449489ab63138de034222ffac8f
2021-01-27 00:52:09 +09:00
Lorenzo Colitti
d69a886235
Rename TetherDownstream6Value to Tether6Value.
...
The two value types are identical so there is no need to have
separate classes for them.
Test: atest TetheringTests
Change-Id: Ia622b082d0a44373d21f51222f5e675e5bde08e0
2021-01-27 00:52:09 +09:00
Lorenzo Colitti
ee3d4edd51
Merge changes from topic "bpf_tether4_rename" am: 3c35666892 am: 7d0693f6dc am: 177975f25b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559687
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I383d31ffb54f0e3f23d1df8b794b544a38a29cac
2021-01-26 15:01:17 +00:00
Lorenzo Colitti
177975f25b
Merge changes from topic "bpf_tether4_rename" am: 3c35666892 am: 7d0693f6dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559687
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I056bdd8ef3117a89ff0f4f28a87978f703a325a2
2021-01-26 14:23:58 +00:00
Lorenzo Colitti
7d0693f6dc
Merge changes from topic "bpf_tether4_rename" am: 3c35666892
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559687
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0addb9a731cdedfb97db001b8e09cb3409f82008
2021-01-26 14:06:50 +00:00
Lorenzo Colitti
3c35666892
Merge changes from topic "bpf_tether4_rename"
...
* changes:
merge Tether{Down,Up}stream4{Key,Value} - part 3 - fixups
merge Tether{Down,Up}stream4{Key,Value} - part 2 - java
merge Tether{Down,Up}stream4{Key,Value} - part 1 - C portion
2021-01-26 13:01:22 +00:00