Commit Graph

11290 Commits

Author SHA1 Message Date
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
Maciej Żenczykowski
914da3d1ba tethering offload ebpf - lower requirement from 5.9 to 5.8 am: b0ac41f0cd am: c456856971 am: 5d6f744551
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24f542f0096677320f1b0f30a55a884a2fa1e5fc
2021-02-15 12:36:33 +00:00
Maciej Żenczykowski
d74918c6d2 Merge "offload ebpf - do_forward4() - introduce updatetime argument" 2021-02-15 12:35:16 +00:00
Maciej Żenczykowski
aefa0950b5 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
2021-02-15 12:33:01 +00:00
Remi NGUYEN VAN
002dd263d7 Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ" am: edc9b873d3 am: e051a098ab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585571

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc013a17bb6750c613250d992a0d3d64bed5ff21
2021-02-15 12:20:34 +00:00
Remi NGUYEN VAN
e4ebb44543 Revert "Address comments on aosp/1550755" am: f77bed6d95 am: 01218f193f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585570

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2882284d1a6c65da2e5e0ce0ef30c469b36229ec
2021-02-15 12:20:32 +00:00
Maciej Żenczykowski
5d6f744551 tethering offload ebpf - lower requirement from 5.9 to 5.8 am: b0ac41f0cd am: c456856971
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6be5ac4bbc887ef11b4fc8110115e11e947fa3
2021-02-15 12:20:22 +00:00
Remi NGUYEN VAN
e051a098ab 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
2021-02-15 11:52:00 +00:00
Remi NGUYEN VAN
01218f193f 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
2021-02-15 11:51:59 +00:00
Maciej Żenczykowski
c456856971 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
2021-02-15 11:51:41 +00:00
Remi NGUYEN VAN
edc9b873d3 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"
2021-02-15 11:39:25 +00:00
Maciej Żenczykowski
b0ac41f0cd 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
2021-02-14 22:24:34 -08:00
Remi NGUYEN VAN
075da46909 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
2021-02-12 06:28:17 +00:00
Remi NGUYEN VAN
f77bed6d95 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
2021-02-12 06:27:44 +00:00
Lorenzo Colitti
c785e87cb5 Merge "Load JNI in all classes that have native methods." am: af97e51c01 am: ceafffa6c0 am: 531fa9e0cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1581528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I140bce0fdff60614b246c67ffdcb724389532612
2021-02-12 06:14:22 +00:00
Treehugger Robot
0f8b31c929 Merge "fix TetheringCoverageTests" am: 6fc8229f16 am: 31ce8ad94d am: 55e1cc23c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1584755

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8d683a42f73acfad318119e34e2e28fa87127ce
2021-02-12 06:14:17 +00:00
Lorenzo Colitti
a299ac8d82 Merge changes I71a37663,Ib2010b38 am: fd710547b2 am: c241c0f4f3 am: c2717c6242
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1583023

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6106bebb2ef3b816374b8652b46d91769a3c716
2021-02-12 06:13:46 +00:00
Lorenzo Colitti
531fa9e0cc Merge "Load JNI in all classes that have native methods." am: af97e51c01 am: ceafffa6c0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1581528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21f1af4785d1ee540ba6dea8416c2538e60a9228
2021-02-12 05:49:17 +00:00
Treehugger Robot
55e1cc23c6 Merge "fix TetheringCoverageTests" am: 6fc8229f16 am: 31ce8ad94d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1584755

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If61cbbe8729451b53aea976540d388868cdde01a
2021-02-12 05:48:49 +00:00
Lorenzo Colitti
c2717c6242 Merge changes I71a37663,Ib2010b38 am: fd710547b2 am: c241c0f4f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1583023

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfc4f1cc18e5e535c35e6738e6a4322866c03a17
2021-02-12 05:47:56 +00:00
Lorenzo Colitti
ceafffa6c0 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
2021-02-12 05:25:23 +00:00
Treehugger Robot
31ce8ad94d 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
2021-02-12 05:24:52 +00:00
Lorenzo Colitti
c241c0f4f3 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
2021-02-12 05:17:01 +00:00
Lorenzo Colitti
af97e51c01 Merge "Load JNI in all classes that have native methods." 2021-02-12 03:19:00 +00:00
Treehugger Robot
6fc8229f16 Merge "fix TetheringCoverageTests" 2021-02-12 03:17:51 +00:00
Lorenzo Colitti
fd710547b2 Merge changes I71a37663,Ib2010b38
* changes:
  Improve testing of registerSystemDefaultNetworkCallback.
  Remove buggy ConnectivityManagerTest#ensureWifiConnected.
2021-02-12 02:45:02 +00:00
Maciej Żenczykowski
c92e8ce636 fix TetheringCoverageTests
Test: atest TetheringCoverageTests now passes, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0d83de14784f323400a83ce282cae1a3e7b4b396
2021-02-11 16:06:46 -08:00
Daulet Zhanguzin
c5fe5ef9b7 Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35 am: c9bee74abd am: 66d9e9aa2c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d65896c29feb6297f9bbb0e36872a2b28240a91
2021-02-11 16:16:10 +00:00
Daulet Zhanguzin
66d9e9aa2c Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35 am: c9bee74abd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida4fef6fdc927a2b9a7547bd1eaf509fa725b0aa
2021-02-11 15:53:23 +00:00
Daulet Zhanguzin
c9bee74abd 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
2021-02-11 15:05:16 +00:00
Daulet Zhanguzin
e1f96f3c35 Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" 2021-02-11 14:44:06 +00:00
Sudheer Shanka
4bd258d0f8 [automerger skipped] Update the way we change meteredness of cellular networks in tests. am: 37c10a2252 am: 4fbac43be8 am: 809cbfe9ff -s ours
am skip reason: Change-Id I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81 with SHA-1 2ca64d3c31 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1582844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f8daf1825797f755e3444cfd146278947d50caf
2021-02-10 17:49:31 +00:00
Sudheer Shanka
809cbfe9ff Update the way we change meteredness of cellular networks in tests. am: 37c10a2252 am: 4fbac43be8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1582844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e97dc0ccf37c39df9fee74bee8d04f5d226af24
2021-02-10 17:04:26 +00:00
Sudheer Shanka
4fbac43be8 Update the way we change meteredness of cellular networks in tests. am: 37c10a2252
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1582844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7eb095710da17da8a6e7785051029d81a64ac7d
2021-02-10 16:42:32 +00:00
Sudheer Shanka
37c10a2252 Update the way we change meteredness of cellular networks in tests.
SubscriptionManager.setSubscriptionOverrideUnmetered() has been updated
to add NET_CAPABILITY_TEMPORARILY_NOT_METERED instead of
NET_CAPABILITY_NOT_METERED. So, we can't rely on that for changing the
meteredness.

Bug: 179664982
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java
Change-Id: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
Merged-In: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
2021-02-10 14:05:09 +00:00
Lorenzo Colitti
baea700554 Improve testing of registerSystemDefaultNetworkCallback.
Addresses comments on aosp/1570840.

Bug: 179774433
Test: test-only change
Change-Id: I71a376631503e5b50ada3f7bb3dca6dbae9ebc27
2021-02-10 22:41:48 +09:00
Sudheer Shanka
384e7c2a45 Merge "Update the way we change meteredness of cellular networks in tests." into sc-dev 2021-02-10 13:13:40 +00:00
Lorenzo Colitti
789e771b3c Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 43b96c711b am: 2d109b3909 am: f5d2df925e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574260

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3fe3f69dc9d85d048767bef113413c412898741
2021-02-10 07:46:18 +00:00
Lorenzo Colitti
50e994aae5 Add CTS coverage for VpnTransportInfo. am: e9aeb3c1c5 am: fc5b95502b am: eb54554df9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia72203b97fe7d75268160c54b247fb39acf17355
2021-02-10 07:46:16 +00:00
Lorenzo Colitti
9b446b90d6 Add test coverage for registerSystemDefaultNetworkCallback. am: 1e5cdd3187 am: 1f40096f3e am: c49cba3526
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09f367980efec9969e8b8b711757fd2909189e24
2021-02-10 07:46:14 +00:00
Lorenzo Colitti
cdde4d0c32 Add IPv4 counters. am: d561b7f67c am: d2956a1964 am: 17b18ca6c2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580287

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56217d9b73e22372e8bdf61e96fa99593b324c24
2021-02-10 07:45:58 +00:00
Lorenzo Colitti
f5d2df925e Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 43b96c711b am: 2d109b3909
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574260

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8822fe3e2e2e2a0c3a290a61df28cb92a63f029
2021-02-10 07:20:31 +00:00
Lorenzo Colitti
eb54554df9 Add CTS coverage for VpnTransportInfo. am: e9aeb3c1c5 am: fc5b95502b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46ac659c13f40d59a304bfd2931e0306d5704c2c
2021-02-10 07:20:30 +00:00
Lorenzo Colitti
c49cba3526 Add test coverage for registerSystemDefaultNetworkCallback. am: 1e5cdd3187 am: 1f40096f3e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ece3d8ce25be1d024376539ba4c9c17e9d15d7b
2021-02-10 07:20:26 +00:00
Lorenzo Colitti
bf5c2979dd Remove buggy ConnectivityManagerTest#ensureWifiConnected.
This method does not behave correctly when wifi is connected but
the last CONNECTIVITY_ACTION broadcast was not for wifi. This
could happen due to another network connecting or disconnecting,
such as VPN.

Bug: 179774433
Test: test-only change
Change-Id: Ib2010b3871133c38b6d508bf508134dd9b814ce2
2021-02-10 15:58:18 +09:00
Lorenzo Colitti
2d109b3909 Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 43b96c711b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574260

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe397a58700e8ad1077a011a9a98f7478f0dc60e
2021-02-10 06:55:58 +00:00