Merge changes from topics "RemoveFindIPv4", "RemoveLegacyVpnRunner" into main am: 8b61783b78
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2797273
Change-Id: If2e9808e5878ea07d7b4d8161dad054006ecc24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Hansen Kurli
authored and
Automerger Merge Worker
commited 2023-11-13 06:03:19 +00:00
007b29987f
Merge changes from topics "RemoveFindIPv4", "RemoveLegacyVpnRunner" into main
...
* changes:
Expect no error for startLegacyVpn with IPv6.
Remove tests related to LegacyVpnRunner.
Hansen Kurli
authored and
Gerrit Code Review
commited 2023-11-13 05:27:07 +00:00
8b61783b78
Merge "[Test] CTS for DNS query fail-fast feature" into main am: a4e35a49b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815393
Change-Id: Ibd7f1e2b72bd70530d759f71ac345601c3a60487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ken Chen
authored and
Automerger Merge Worker
commited 2023-11-13 04:06:44 +00:00
efc321673f
Merge "[Test] CTS for DNS query fail-fast feature" into main
Ken Chen
authored and
Gerrit Code Review
commited 2023-11-13 03:23:40 +00:00
a4e35a49b7
[Test] CTS for DNS query fail-fast feature
...
For Power Saver tests, verify not only the network connectivity of
restricted apps, but also error cause.
Bug: 288340533
Test: atest
CtsHostsideNetworkTests: com.android.cts.net.HostsideNetworkCallbackTests
Change-Id: I122b62891175cd4a035f3c51c5b6073b34f8fd82
Ken Chen
commited 2023-11-11 11:19:35 +08:00
a10c53cc0d
Merge "Update to fmtlib 10.1.1" into main am: c64eb2d816
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817307
Change-Id: I27f9693e534e849a357bc7a7fb482e2ceb67da8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Henri Chataing
authored and
Automerger Merge Worker
commited 2023-11-10 19:01:39 +00:00
c45a255514
Merge "Update to fmtlib 10.1.1" into main
Henri Chataing
authored and
Gerrit Code Review
commited 2023-11-10 17:48:43 +00:00
c64eb2d816
Add equals, hashCode to MulticastRoutingConfig am: d25444ffce
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801433
Change-Id: Idadb7ea191e032e8d64f0a5b3b05ebd9997fcb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yang Sun
authored and
Automerger Merge Worker
commited 2023-11-10 11:17:56 +00:00
49249f365e
Add equals, hashCode to MulticastRoutingConfig
...
Add helper functions to help compare if MulticastRoutingConfig
has changed.
Test: atest MulticastRoutingConfigTest
Change-Id: I30ed4796efbaafbcf1a273c12a9231ec02bc36f0
Yang Sun
commited 2023-11-10 13:06:22 +08:00
d25444ffce
Update to fmtlib 10.1.1
...
fmtlib 10+ removes the automatic formatting
of enum classes to the underlying class, requesting
that a custom formatter be provided for the type.
Normally fmt::underlying could be used to convert
the enum value to its backing type, but this change
automerges to udc-mainline-prod where the helper does
not exist.
Bug: 310046696
Test: m
Change-Id: I62f3a66dd2f8e3d288dc4c0298d4f3bfa57a6a71
Henri Chataing
commited 2023-11-10 01:53:03 +00:00
9007cca051
Merge "Add NSD_LIMIT_LABEL_COUNT flag" into main
Paul Hu
authored and
Gerrit Code Review
commited 2023-11-09 14:09:29 +00:00
a96c86d34a
Merge "Add test to make sure that unwanted local nets disconnect correctly" into main am: 7cf6e5a3b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2793352
Change-Id: I7fbd9a87505710c3d6c784087faa19343fb60837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-11-09 02:37:35 +00:00
ee97d31f68
Merge "Add test to make sure that unwanted local nets disconnect correctly" into main
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-09 02:08:36 +00:00
7cf6e5a3b0
Merge "New firewall chain for default background restrictions" into main am: 6bca8c1df8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2818818
Change-Id: I38579c52fedcbfd11e20bf051a2890ac8ce2e52b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Suprabh Shukla
authored and
Automerger Merge Worker
commited 2023-11-08 14:29:56 +00:00
22116cc206
New firewall chain for default background restrictions
...
A new firewall chain is needed to configure background network
restrictions for apps.
This change only adds the API stubs and traffic controller constants to
make the chain work. Policy changes using this chain will follow in
the framework code.
Test: atest CtsNetTestCases:ConnectivityManagerTest
Test: atest ConnectivityServiceTest
NO_IFTTT=The Lint rule along with the relevant code in Common.h is
being deleted in aosp/2819759
Bug: 304347838
Change-Id: I33e2db6671431f7c576fc931d9f96e684fc1e78a
Suprabh Shukla
commited 2023-11-08 10:17:30 +00:00
2d893b68a9
Add NSD_LIMIT_LABEL_COUNT flag
...
Bug: 307475137
Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Merged-In: I48b1dc26f41549ec4afc71f87e98a02ac773430f
Change-Id: Ic4c2e4c0d61b76b1afd556560c18171bdb7a088e
Paul Hu
commited 2023-11-08 16:25:27 +08:00
fd357ef695
Merge changes Ie1a36c3c,Id727cf7b,Ifba198d9 into main am: 87f7f27ad0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817124
Change-Id: I7dbcc7e510e40951809d1f7b6d534f3376903d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-11-07 19:39:59 +00:00
6d2868f1fc
Merge changes Ie1a36c3c,Id727cf7b,Ifba198d9 into main
...
* changes:
Remove unnecessary check for skDestroyListener
Remove TrafficController
Remove native code path in BpfNetMaps.java
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2023-11-07 19:32:51 +00:00
87f7f27ad0
Merge changes I301bf032,I8caca97b into main am: e28740f79b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801573
Change-Id: I5e87f8eac13af3e213ccfbeae9c89fd93e80f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-11-07 14:01:09 +00:00
04523693b2
Merge changes I301bf032,I8caca97b into main
...
* changes:
Rename TiramisuConnectivityInternalApiUtil
Add LocalNetworkInfo and send callbacks when it changes
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-07 13:29:00 +00:00
e28740f79b
Add test to make sure that unwanted local nets disconnect correctly
...
Also add some toString() methods that were useful in debugging.
Test: new test in CSLocalAgentTests
Change-Id: Ife95815e39d92bbef84b1c5ea75a151882590d09
Chalard Jean
commited 2023-11-07 22:28:25 +09:00
4fe2339f2c
Remove native code path in BpfNetMaps.java
...
BpfNetMaps uses java library for updating bpf map as the default code
path.
This is already released to 100% production without any issues.
So this CL removes the old code path from BpfNetMaps.
Note that native_init only opens the bpf maps if sEnableJavaBpfMap is
true.
But if sEnableJavaBpfMap is true, no native code in TrafficController
access the bpf map.
So this CL can remove native_init.
Following CL will remove the nativce codes for old code path.
Bug: 217624062
Test: NetworkStaticLibsTests
Change-Id: Ifba198d9e6f93b53fd1dbf3b2aafb644da0b147d
Motomu Utsumi
commited 2023-11-07 17:45:32 +09:00
96b6c39229
Add LocalNetworkInfo and send callbacks when it changes
...
Test: CSLocalAgentTest
Change-Id: I8caca97b891081f9212a01d428a34ed1a08d5126
Chalard Jean
commited 2023-11-07 17:29:38 +09:00
22350c93b4
Merge "Remove @IgnoreUpTo(Q) annotation and isAtLeastR() check" into main am: 9846b924b8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817245
Change-Id: I9a69a6834a9b2644753b85130499bd6f99efcf00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2023-11-07 06:00:59 +00:00
2b2b7bbbb9
Merge "Remove @IgnoreUpTo(Q) annotation and isAtLeastR() check" into main
Chiachang Wang
authored and
Gerrit Code Review
commited 2023-11-07 05:21:12 +00:00
9846b924b8
Merge "Set up forwarding rules for local network agents" into main am: 85fce4f871
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777671
Change-Id: I3e013ec164c36312f7bf74347f7cacd27cd1aa48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-11-07 03:36:16 +00:00
2d805554fc
Merge "Set up forwarding rules for local network agents" into main
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-07 02:50:50 +00:00
85fce4f871
Set up forwarding rules for local network agents
...
Test: CSLocalAgentTests, new tests for this
Change-Id: I8994af350a1799ab5f6ebb2872f2abfaf174bd61
Chalard Jean
commited 2023-11-06 20:18:50 +09:00
1e4c218c28
Merge "Add methods for updating ingressDiscardRule bpf map to BpfNetMaps" into main am: d872c3c960
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2795710
Change-Id: I5fda9b2aeedf749666166ac85752ec41808a39f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2023-11-06 10:57:10 +00:00
e0212cf3a9
Merge "Limit the label count when parsing a mDns packet" into udc-mainline-prod
Paul Hu
authored and
Android (Google) Code Review
commited 2023-11-06 10:50:41 +00:00
a689544a00
Merge "Add methods for updating ingressDiscardRule bpf map to BpfNetMaps" into main
Motomu Utsumi
authored and
Gerrit Code Review
commited 2023-11-06 10:41:53 +00:00
d872c3c960
Merge changes from topic "apipluscts" into main am: 092839a6b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749784
Change-Id: I420509b8c2314fb9b5cb13be01039d6978bbd6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Junyu Lai
authored and
Automerger Merge Worker
commited 2023-11-06 09:43:28 +00:00
5cab20f22b
Remove @IgnoreUpTo(Q) annotation and isAtLeastR() check
...
Remove the Q test annotation/check since mainline updates does
not push to Q anymore. This annotation is unnecessary now.
Test: atest FrameworksNetTests
Change-Id: Iba4f38731db9f369f99ba12a3ab7ef3f3b1630b8
Chiachang Wang
commited 2023-11-06 09:35:28 +00:00
a8efe40865
[BR03.1] Expose isUidNetworkingBlocked
...
Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideNetworkCallbackTests
Bug: 297836825
Change-Id: I70b2351b9cd1c3c6fa34258397e0bf22cb8150b2
Junyu Lai
commited 2023-11-06 13:26:19 +08:00
bb59480733
Merge "[Test] Fix DNS resolver MTS failures" into main am: bf1f867ce6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817156
Change-Id: Ia2765e4b0950622d5cb67a0fb57f5dce36f60763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-11-06 04:17:09 +00:00
0f2a2255e8
[Test] Fix DNS resolver MTS failures
...
In MTS, test infra installs only the DNS resolver module without
installing tethering module. The test utils should not assume the BPF
maps defined in tethering will be in the device.
Bug: 309164580
Test: atest
resolv_integration_test:ResolverTest#BlockDnsQueryWithUidRule
Change-Id: I2c7349a11c9b413c129c93d236c8280588097cf7
Ken Chen
commited 2023-11-04 16:10:34 +08:00
90e009be6c
Merge "Add forwarding methods to RoutingCoordinator" into main am: 1d6c358a9d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2812074
Change-Id: I06212207bee099b3d50c2699ae4e527323533d5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-11-03 05:14:17 +00:00
1a958d349b
Rename KEEP_CONNECTED_DOWNSTREAM_NETWORK to K_C_LOCAL_NETWORK am: 842a914dff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2796004
Change-Id: Iceefdc537ee8bbcb8bcf136266a3c18d33700e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chalard Jean
authored and
Automerger Merge Worker
commited 2023-11-02 16:43:19 +00:00
2669aaf1d8
Enforce structural NetworkAgent constraints am: 78c9a381c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2805415
Change-Id: I757e262be942d58f4bd0d7b602ec4f694e31623a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chalard Jean
authored and
Automerger Merge Worker
commited 2023-11-02 16:43:15 +00:00
c1581b5567
Add forwarding methods to RoutingCoordinator
...
Test: RoutingCoordinatorServiceTest
TetheringTest
Change-Id: I2fa6250875d517c3452c85a3678d3feb0c0354d8
Chalard Jean
commited 2023-11-02 23:25:32 +09:00
820ce9df2d
Rename KEEP_CONNECTED_DOWNSTREAM_NETWORK to K_C_LOCAL_NETWORK
...
...following feedback
Test: FrameworksNetTests
Change-Id: I9c25f0b066a58980bf071d2b958223ed609f0d8e
Chalard Jean
commited 2023-11-02 23:25:31 +09:00
842a914dff
Enforce structural NetworkAgent constraints
...
Avoid network agents trying to do things that the stack
does not support.
Test: new test in this change
Change-Id: I3ffa1c3ddbb0b648b06862dc0a44f8525d358acc
Chalard Jean
commited 2023-11-02 23:25:11 +09:00
78c9a381c9
Expect no error for startLegacyVpn with IPv6.
...
findIPv4DefaultRoute() is removed from Vpn, so
IllegalStateException is no longer thrown for IPv6 only
networks.
The test testStartLegacyVpnIpv6 is now not testing anything new
and so it is removed. Note that other tests that will be calling
startLegacyVpn() ensure coverage is not lost.
Bug: 161776767
Test: atest FrameworksNetTests
Change-Id: I6ac9d7c196b7bc4c44fc2ad32baa25b106640ef4
Hansen Kurli
commited 2023-11-02 21:11:12 +08:00
70bc73223e
Remove tests related to LegacyVpnRunner.
...
LegacyVpnRunner is removed, remove the following related tests:
1. testStartRacoonNumericAddress
2. testStartRacoonHostname
3. testStartPptp
4. testStartPptp_NoMppe
Create a new test that asserts UnsupportedOperationException for
the VPN types in those tests.
Bug: 161776767
Test: atest FrameworksNetTests
Change-Id: Id66d09ea54576ca4c641e8f69d104dc26a42c46b
Hansen Kurli
commited 2023-11-02 21:07:06 +08:00
879655c77b
Merge "Run CSDestroyedNetworkTests starting in R" into main am: 4fd9451cdb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815133
Change-Id: I0b70aca084a4148c3d1bd03936ea54a0e657c750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-11-02 10:58:40 +00:00
bf63c15d61
Merge "Run CSDestroyedNetworkTests starting in R" into main
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-02 10:23:50 +00:00
4fd9451cdb
Merge "[BR06] Support check whether network is blocked by data saver" into main am: 31ab762e42
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742874
Change-Id: I636c60013d9140fc2c01f90044a86db695de4873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Junyu Lai
authored and
Automerger Merge Worker
commited 2023-11-02 07:35:33 +00:00
47dbd551ee
Merge "[BR06] Support check whether network is blocked by data saver" into main
Junyu Lai
authored and
Gerrit Code Review
commited 2023-11-02 07:09:50 +00:00
31ab762e42
Run CSDestroyedNetworkTests starting in R
...
This can only run where the connectivity module is updated
Bug: 308601625
Test: TH
Change-Id: Icc5df3013e90070502a805abe89725591470b464
Chalard Jean
commited 2023-11-02 14:00:16 +09:00
0a0be176d2
Merge "Add Data Saver utils in Firewall test helper class" into main am: 90428539d6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2804117
Change-Id: I9be6f9c710966b5b2ad3954774271894782ed48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ken Chen
authored and
Automerger Merge Worker
commited 2023-11-02 03:04:10 +00:00
d27478c96e