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
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
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
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
Lorenzo Colitti
8564a5ca06
Mark the EntitlementManager PendingIntents as immutable. am: a36d65da0a am: ec93812466 am: 8688028150
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557108
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie300969f4d942fedefb5f23d7cba6eab37de521f
2021-01-26 12:32:37 +00:00
Lorenzo Colitti
b03a4b86f3
Fix a WTF in IpServerTest. am: ae27ecf5ad am: 595a330cc6 am: 9d829044e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557107
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14159abd35b2bc701b2994a46617e407f020512c
2021-01-26 12:32:35 +00:00
Lorenzo Colitti
8688028150
Mark the EntitlementManager PendingIntents as immutable. am: a36d65da0a am: ec93812466
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557108
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb900d82e5b8a67ae2be1e448966f6199986539d
2021-01-26 12:03:36 +00:00
Lorenzo Colitti
9d829044e9
Fix a WTF in IpServerTest. am: ae27ecf5ad am: 595a330cc6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557107
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie29e806685ee0930ec00ad85f8f9c15ace3e6cf6
2021-01-26 12:03:33 +00:00
Lorenzo Colitti
ec93812466
Mark the EntitlementManager PendingIntents as immutable. am: a36d65da0a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557108
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I592fb8876e2c51c5c7c2a043d1a313fe1523ac6a
2021-01-26 11:20:13 +00:00
Lorenzo Colitti
595a330cc6
Fix a WTF in IpServerTest. am: ae27ecf5ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557107
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3da0e7ad36002361287e63a8724e25dcd940bd0c
2021-01-26 11:20:10 +00:00
Lorenzo Colitti
a36d65da0a
Mark the EntitlementManager PendingIntents as immutable.
...
These are read-only intents and should not be mutated by any
app receiving them.
Bug: 178324405
Bug: 178249531
Test: atest TetheringTests TetheringCoverageTests GtsTetheringTestCases
Change-Id: I5395e7c19e6453640ad790f2b9a9ba22bbcefa88
2021-01-26 15:14:26 +09:00
Lorenzo Colitti
ae27ecf5ad
Fix a WTF in IpServerTest.
...
Bug: 178324405
Test: atest TetheringTests
Change-Id: I2069ea79f982e6bb197388edd7820a05d1e651f1
2021-01-26 15:14:26 +09:00
Maciej Żenczykowski
911a7267f5
merge Tether{Down,Up}stream4{Key,Value} - part 3 - fixups
...
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Ia7840698e80ded33d8e0b59efe1ca7267254b892
2021-01-25 20:32:10 -08:00
Maciej Żenczykowski
32874eb6bc
merge Tether{Down,Up}stream4{Key,Value} - part 2 - java
...
Generated via:
git grep 'Tether(Down|Up)stream4(Key|Value)' | cut -d: -f1 | sort -u | while read i; do
sed -r -i 's@TetherUpstream4Value@Tether4Value@g' "$i"
sed -r -i 's@TetherDownstream4Value@Tether4Value@g' "$i"
sed -r -i 's@TetherDownstream4Key@Tether4Key@g' "$i"
sed -r -i 's@TetherUpstream4Key@Tether4Key@g' "$i"
done
cd Tethering/src/com/android/networkstack/tethering
git mv TetherUpstream4Key.java Tether4Key.java
git mv TetherUpstream4Value.java Tether4Value.java
git diff TetherDownstream4Key.java Tether4Key.java
git diff TetherDownstream4Value.java Tether4Value.java
git rm TetherDownstream4Key.java
git rm TetherDownstream4Value.java
Fixup resulting 'import' duplication
mcedit Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java
mcedit Tethering/apishim/30/com/android/networkstack/tethering/apishim/api30/BpfCoordinatorShimImpl.java
mcedit Tethering/apishim/common/com/android/networkstack/tethering/apishim/common/BpfCoordinatorShim.java
mcedit Tethering/tests/unit/src/android/net/ip/IpServerTest.java
Test: N/A, requires follow up commit
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I1dfc3108ca4bbd0cefc3420bc7e421594b62619c
2021-01-25 20:32:05 -08:00
Maciej Żenczykowski
1feb8b4ac8
merge Tether{Down,Up}stream4{Key,Value} - part 1 - C portion
...
The keys are identical, and the values nearly so, this will make everyone's life easier.
Test: git grep 'Tether(Down|Up)stream4(Key|Value)' finds nothing
(note this requires follow up commits)
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Ifbff2c617ac5834ea80f827eaf89ca81e862baec
2021-01-25 20:31:11 -08:00
Lorenzo Colitti
0d497319fe
Merge changes I8cd6e49b,Ibb52c7b7 am: dc4189f0e4 am: 3b0f7f1d6e am: 4158939871
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifad6ded6097c458cc1b5dba9d167c5920ff2c180
2021-01-26 02:14:37 +00:00
Lorenzo Colitti
4158939871
Merge changes I8cd6e49b,Ibb52c7b7 am: dc4189f0e4 am: 3b0f7f1d6e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iebb3cd0581e7262708b825747b990336f87de72a
2021-01-26 01:45:16 +00:00
Lorenzo Colitti
3b0f7f1d6e
Merge changes I8cd6e49b,Ibb52c7b7 am: dc4189f0e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc66bcdefb9ca3f1e8d393923d0ce2031cbba302
2021-01-26 00:57:37 +00:00
Lorenzo Colitti
dc4189f0e4
Merge changes I8cd6e49b,Ibb52c7b7
...
* changes:
[NFCT.TETHER.10] Add/delete IPv4 offload BPF rules to/from BPF map
[NFCT.TETHER.9] Build IPv4 offload BPF rules for raw ip
2021-01-26 00:30:15 +00:00
Maciej Żenczykowski
7f66042df3
offload - begin ipv4 tethering implementation am: c2b0146045 am: 7c3ecd4aee am: 5ccabb7880
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I813dc2950cb099fadb4aadd2230bc2292c44823b
2021-01-25 21:27:30 +00:00
Maciej Żenczykowski
5ccabb7880
offload - begin ipv4 tethering implementation am: c2b0146045 am: 7c3ecd4aee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I801205435f7617cfe0d49d8c459a538650a5eff4
2021-01-25 20:35:27 +00:00
Maciej Żenczykowski
7c3ecd4aee
offload - begin ipv4 tethering implementation am: c2b0146045
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74f1e77cc5304c380d82d40578f67448c2eb0559
2021-01-25 20:05:44 +00:00
Maciej Żenczykowski
689df6977d
offload - ignore ethernet packets not destined for us am: 18552e8fb3 am: 258660ccff am: be68e49daa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559389
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e4307df74d4ed96fc1fb6367561fbc3c29c6f39
2021-01-25 20:04:24 +00:00
Maciej Żenczykowski
425d6c3bc6
rename do_forward to do_forward6 am: bf8ec1a21d am: 6b48c492c2 am: 6588fd6a86
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559388
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibdc43f8d6f25dd603fdc9c22af622109e995efde
2021-01-25 20:03:59 +00:00
Maciej Żenczykowski
be68e49daa
offload - ignore ethernet packets not destined for us am: 18552e8fb3 am: 258660ccff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559389
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iceb78013e560cb4550fe7dac5e0619dc11074e90
2021-01-25 19:50:21 +00:00
Maciej Żenczykowski
6588fd6a86
rename do_forward to do_forward6 am: bf8ec1a21d am: 6b48c492c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559388
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iea4767add4bbf877e2fe79d6578b4ebb82f6a8a7
2021-01-25 19:49:30 +00:00
Maciej Żenczykowski
258660ccff
offload - ignore ethernet packets not destined for us am: 18552e8fb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559389
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3a038d69bb84c3244258c47c39b214b1b100586
2021-01-25 19:28:13 +00:00
Maciej Żenczykowski
6b48c492c2
rename do_forward to do_forward6 am: bf8ec1a21d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559388
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1e1a0219585199f62dff3f69b08fcdc1ed2f55d
2021-01-25 19:25:01 +00:00
Maciej Żenczykowski
c2b0146045
offload - begin ipv4 tethering implementation
...
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I0ad143be954d55d0ed39853031c7bd364378e1ec
2021-01-25 19:07:40 +00:00
Hungming Chen
dd833dee31
[NFCT.TETHER.10] Add/delete IPv4 offload BPF rules to/from BPF map
...
Access the IPv4 downstream and upstream BPF map with the built rules.
Test: atest TetheringCoverageTests
Change-Id: I8cd6e49b377c72250988019eea57f93cccd78309
2021-01-25 20:13:47 +08:00
Maciej Żenczykowski
18552e8fb3
offload - ignore ethernet packets not destined for us
...
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Icabd1db48a1189425a941384d534c0f18bf20827
2021-01-24 19:59:21 -08:00
Maciej Żenczykowski
bf8ec1a21d
rename do_forward to do_forward6
...
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I649dc490b1883a1e97f748370a77c956f1315e2e
2021-01-24 19:59:16 -08:00
Nucca Chen
a950792808
Merge changes I73f30477,I84db13ac am: 2f1c2b25cd am: 2b82a04b56 am: d98f2b685f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1534829
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I468c45d5bb13a55bc525dd8f839de1af87214b6b
2021-01-23 14:55:05 +00:00
Nucca Chen
d98f2b685f
Merge changes I73f30477,I84db13ac am: 2f1c2b25cd am: 2b82a04b56
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1534829
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5cc251fb9b525ca3762e12f6d5ce4d935a4fa04a
2021-01-23 14:13:07 +00:00
Nucca Chen
2b82a04b56
Merge changes I73f30477,I84db13ac am: 2f1c2b25cd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1534829
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3df71008b8801047660b9ccc15158fb76211b5c
2021-01-23 13:57:32 +00:00
Nucca Chen
2f1c2b25cd
Merge changes I73f30477,I84db13ac
...
* changes:
[NFCT.TETHER.8] Prepare the upstream information for IPv4 offload rule
[NFCT.TETHER.7] Prepare the downstream information for IPv4 offload rule
2021-01-23 13:40:30 +00:00
Maciej Żenczykowski
90b75813a7
bpf tether offload - do not offload TCP SYN/FIN/RST packets am: fc4f6540be am: d4fb2bcf13 am: 664081beb9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1558667
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I37f09f6fdbca6242e449a9436708caedc52a1a69
2021-01-23 11:18:14 +00:00
Maciej Żenczykowski
664081beb9
bpf tether offload - do not offload TCP SYN/FIN/RST packets am: fc4f6540be am: d4fb2bcf13
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1558667
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I442286cce3b115921175d363d7134f67d73af85d
2021-01-23 11:01:53 +00:00
Maciej Żenczykowski
d4fb2bcf13
bpf tether offload - do not offload TCP SYN/FIN/RST packets am: fc4f6540be
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1558667
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d5fef2e673d96a465a8d8c12a973cf8193089f4
2021-01-23 08:52:06 +00:00
Maciej Żenczykowski
fc4f6540be
bpf tether offload - do not offload TCP SYN/FIN/RST packets
...
We want connection establishment/shutdown to flow through
the kernel code path so connection tracking state is at least
somewhat correct.
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Iee97baa65750188f3436937b16c9b320f0495a5a
2021-01-23 07:11:07 +00:00
Sudheer Shanka
e34e20ba8a
Merge "Update test to include FLAG_MUTABLE when creating a PendingIntent."
2021-01-23 00:43:36 +00:00
Sudheer Shanka
b8e550e8be
Update test to include FLAG_MUTABLE when creating a PendingIntent.
...
Fixes: 178077028
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Ignore-AOSP-First: FLAG_MUTABLE is not available in aosp
Change-Id: I91013ffe375fb7befc58134a571ea9ab37c3affa
2021-01-22 23:12:48 +00:00
Roland Levillain
78cfb25b61
Merge "Added aidl for qos callback" am: 86654be2d8 am: 564a92f6c4 am: 90bbc8eede
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1487838
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icb018abd9d6778664c5d5cb29055325f6649dbdc
2021-01-22 15:53:14 +00:00
Roland Levillain
90bbc8eede
Merge "Added aidl for qos callback" am: 86654be2d8 am: 564a92f6c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1487838
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c4b1f885e08f9975c3fd8d45076afbb2a7eba3f
2021-01-22 15:21:29 +00:00
Roland Levillain
564a92f6c4
Merge "Added aidl for qos callback" am: 86654be2d8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1487838
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c6fcd093580e90bc17b6582797de162fa06f73a
2021-01-22 14:56:33 +00:00
Roland Levillain
86654be2d8
Merge "Added aidl for qos callback"
2021-01-22 14:19:58 +00:00