Commit graph android_packages_modules_Co.../tests
Message SHA1
Merge "Use frameworks/libs/net version of SharedLog" am: d5c6a891b4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2129981

Change-Id: I7ea6d753680102d1440e6b24d37a136d3ff4225b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-07-08 07:16:54 +00:00
7ca4bb0c7f
Use frameworks/libs/net version of SharedLog
Test: m
Bug: 235901424
Change-Id: Ibfa7821c68c41036a47e765f15078cd5d195afb8

Patrick Rohr   commited 2022-07-07 12:52:58 -07:00
b873e25ab4
Merge "ClatCoordinator: Dump ClatdTracker information" am: 78cf7c5e29
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2145582

Change-Id: I9dc2bbabb924e0fe97c28c454d5a6c697792876e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-05 15:20:52 +00:00
011b8dca41
Merge "ClatCoordinator: Dump ClatdTracker information"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-05 15:01:11 +00:00
78cf7c5e29
ClatCoordinator: Dump ClatdTracker information
Test: atest ClatCoordinatorTest
Change-Id: I6bb47c84321e1323496b728f2db939ee8d74504a

Hungming Chen   commited 2022-07-05 15:30:50 +08:00
a760a10474
Merge "Remove unnecessary null check" am: daced9e4b8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138293

Change-Id: Iff508925baf00ae327d94a666cc1fb22726b94d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-04 18:57:15 +00:00
be5920c6cd
Merge "Remove unnecessary null check"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-04 18:37:07 +00:00
daced9e4b8
Remove unnecessary null check
Address review comments from aosp/2131752 and aosp/2117045
sConfigurationMap must have a entry for UID_RULES_CONFIGURATION_KEY
because this bpf map is an array

Bug: 217624062
Test: atest BpfNetMapsTest
Change-Id: Ic52623e11c1f53e363416d57c0d8705d5510ef04

Motomu Utsumi   commited 2022-07-04 09:20:23 +00:00
1f73fedfef
Merge changes I3250bdb9,I20f6e5e1,I70c96a09,I88f77bd4,If6cefa51, ... am: eae7873814
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2132998

Change-Id: I15e95bb16a182d0bbc5c3e3ad222d1bbf4738df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-07-01 23:15:34 +00:00
29b87b830b
Merge changes I3250bdb9,I20f6e5e1,I70c96a09,I88f77bd4,If6cefa51, ...
* changes:
  ethernet: rename methods in EthernetNetworkFactory
  ethernet: move registerNetworkOffer into its own function
  ethernet: provider to keep track of requestId
  ethernet: return result when removing interface
  ethernet: enable testCallbacks_forServerModeInterfaces on CF
  ethernet: expand server mode callbacks test
  ethernet: add test for removing interface while in server mode

Patrick Rohr   authored and   Gerrit Code Review   commited 2022-07-01 23:03:24 +00:00
eae7873814
ethernet: enable testCallbacks_forServerModeInterfaces on CF
testCallbacks_forServerModeInterfaces was previously skipped on CF as
isAdbOverNetwork() was true. The existing interface on CF has configured
NetworkCapabilities which excludes it from being used in tethering.
Using assumeNoInterfaceForTetheringAvailable() is therefore a better
assumption check for this test.

Test: atest EthernetManagerTest
Change-Id: If6cefa519b32d041c8dccc0a58acb3028eefd878

Patrick Rohr   commited 2022-07-01 11:48:24 -07:00
525c30205c
ethernet: expand server mode callbacks test
Bug: 236895792
Test: atest EthernetManagerTest
Change-Id: Ib74fc0689592ebce7247d5f36a60b68ede6713a9

Patrick Rohr   commited 2022-07-01 11:48:24 -07:00
43fa51ca2e
ethernet: add test for removing interface while in server mode
Bug: 236892130
Test: atest EthernetManagerTest#testRemoveInterface_whileInServerMode
Change-Id: I3ca71cd87301da8e96d31f7632b69d318ee97d4a

Patrick Rohr   commited 2022-07-01 11:48:20 -07:00
f34945bf6f
Merge "DscpPolicy Move to kernel 5.15" am: b3ec6329e7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141233

Change-Id: Ide70a39a798d6f609104c305577a75f788d72105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-01 16:12:23 +00:00
7921079cf8
Merge "DscpPolicy Move to kernel 5.15"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-01 15:55:10 +00:00
b3ec6329e7
DscpPolicy Move to kernel 5.15
Require at least kernel 5.15. Feature is not required on older
kernels and may impact boot time unnecessarily.

Bug: 235559605
Change-Id: I2e4b509de1d8940fc63ae057a8326f13c0fd1420

Tyler Wear   commited 2022-06-30 19:41:03 +00:00
a8ca597aec
Merge "Refactor BpfNetMaps and getChainEnabled" am: 51a03d629e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2135061

Change-Id: Ia3e745d43be4f20af2c7b68f9628e9bb2b3d1003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2022-06-30 07:09:35 +00:00
1608aed5c7
Merge "Refactor BpfNetMaps and getChainEnabled"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2022-06-30 06:48:10 +00:00
51a03d629e
Merge "Decouple security exception check test from ConnectivityServiceTest" am: bb2e871cce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133162

Change-Id: Iffad1426c2939aa7fa9b773a695870ab1cdb542d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-06-30 02:00:38 +00:00
c568a0e522
Merge changes from topic "appExclusionPackage" am: 5b4ad7c47a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2106025

Change-Id: Ica923dd09dbe9963296f1aa0917106ae090ad52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-06-30 02:00:10 +00:00
8003ddb079
Add VpnTestBase for VPN test common code am: 9f672bdae6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138296

Change-Id: I23385dae07b0f62d4613eb386867c5c4a91f2da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

chiachangwang   authored and   Automerger Merge Worker   commited 2022-06-30 02:00:07 +00:00
4a1860836d
Merge "Decouple security exception check test from ConnectivityServiceTest"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-06-30 01:36:46 +00:00
bb2e871cce
Merge changes from topic "appExclusionPackage"
* changes:
  Test VPN app exclusion
  Add VpnTestBase for VPN test common code

Chiachang Wang   authored and   Gerrit Code Review   commited 2022-06-30 01:34:54 +00:00
5b4ad7c47a
Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master
Xin Li   authored and   Android (Google) Code Review   commited 2022-06-29 21:22:03 +00:00
514698c728
Decouple security exception check test from ConnectivityServiceTest
Decouple security exception check test from ConnectivityServiceTest
to VpnManagerServiceTest.

These security exception tests landed in ConnectivityServiceTest
because of no VpnManagerServiceTest. Move the tests to the
VpnManagerServiceTest where is better place to put the VPN related
tests to reduce the size of ConnectivityServiceTest.

Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: I94b691c4d1f63bd5226e3296e6d0160dcb03107c

chiachangwang   commited 2022-06-29 06:15:41 +00:00
1aef309197
Test VPN app exclusion
Initialize the VpnManagerServiceTest and verify app exclusion
design.

Bug: 231373589
Test: atest FrameworksNetTests
Change-Id: Icf3994a58de7b2fcc6fafe9712b5ac94e6c2c134

chiachangwang   commited 2022-06-29 06:15:41 +00:00
7f5d04962b
Add VpnTestBase for VPN test common code
This is a no-op change to move some common codes that share
between different VPN unit tests to the new base class.
It's helpful to reduce the code duplication for the follow up
work to add the VpnManagerServiceTest and other test codes
refactor.

Bug: 231373589
Test: atest FrameworksNetTests
Change-Id: Id5111e7ca33ea8f9eb4bcc6c13d0e681f0664d24

chiachangwang   commited 2022-06-29 03:06:09 +00:00
9f672bdae6
Merge "Use import for testAndCleanup"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-06-29 00:53:47 +00:00
1108b129df
Merge "Increase max delay for Admin UID propogation"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-28 23:43:43 +00:00
07cadf26fa
Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: Ic05ca7fe4adaa94f79e59758569f7595ab4c4f54
Change-Id: Id2ed4b3865be3c959c4cb62a31fba318f5b6fd77

Xin Li   commited 2022-06-28 21:23:32 +00:00
e9ece30105
Use import for testAndCleanup
Follow up work to remove the TODO since it's available in all
branches.

Test: ates VpnTest
Change-Id: I0830148e8577f98616f24d9ee4224496f51bd692

chiachangwang   authored and   Chiachang Wang   commited 2022-06-28 10:57:25 +00:00
337726529b
Merge "Add mdns files and unit tests"
Paul Hu   authored and   Gerrit Code Review   commited 2022-06-28 05:43:58 +00:00
57852487b8
Add mdns files and unit tests
- Put mdns code to service/mdns because we don't want to impact
  coverage for code that's not yet in use.
- Also fix some lint errors
  - Common typo errors
  - Lines longer than 100 characters
- Update IgnoreUpTo from S to SC_V2 because the tests should be
  ignored until T.

Bug: 232766079
Test: atest FrameworksNetTests
Change-Id: I19af3bf7ae004bd37960f2ad9014cf0c6a804c8d

Paul Hu   commited 2022-06-28 09:54:39 +08:00
3e1f4489bf
Merge "ethernet: skip test that uses TUNSETCARRIER on old kernels"
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-06-27 18:04:37 +00:00
71de950b75
Refactor BpfNetMaps and getChainEnabled
Address comments from aosp/2117045 and aosp/2131752
Rename USE_NETD to PRE_T
Rename getChainEnabled to isChainEnabled
Remove unnecessary parentheses
Fix comment

Bug: 217624062
Test: atest BpfNetMapsTest
Change-Id: Iaff8c9fc5f74de3fe41a7fb010355b1742fbce90

Motomu Utsumi   commited 2022-06-27 14:33:28 +00:00
25cf86fc95
Merge "Use java BpfMap in BpfNetMaps#setChildChain"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2022-06-27 05:44:38 +00:00
bccf9df50e
Merge "Add API to get current firewall chain status"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2022-06-27 05:43:46 +00:00
6421d8456c
Use java BpfMap in BpfNetMaps#setChildChain
Bug: 217624062
Test: atest BpfNetMapsTest android.net.cts.ConnectivityManagerTest#testFirewallBlocking

Change-Id: I13e96911eccd7d1d0545a156ddc2859bcaac09eb

Motomu Utsumi   commited 2022-06-24 09:11:58 +00:00
18b287d285
Add API to get current firewall chain status
This commit adds ConnectivityManager#getFirewallChainEnabled to read the
current firewall chain status

Bug: 208371987
Test: m
Change-Id: I1eadb69f953af5d031cd8dabde3e1f098cf0f4df

Motomu Utsumi   commited 2022-06-24 09:11:53 +00:00
be3ff1e923
Add test for startPptp
The test verifies arguments used to start the daemon

Bug: 201660636
Test: atest VpnTest
Change-Id: I0854fbeaf1a3e3554c157fde227a7bfa187b1013
Merged-In: I0854fbeaf1a3e3554c157fde227a7bfa187b1013

Remi NGUYEN VAN   authored and   chiachangwang   commited 2022-06-24 03:33:30 +00:00
522cea7d4e
Merge "Validate or set the eth specifier on update Iface" am: 85694dc277 am: c9bb8aab8b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2128511

Change-Id: I3977abc3d6235de9f020c0bcac3df1991714c5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-23 16:55:58 +00:00
2ec893bbe7
ethernet: skip test that uses TUNSETCARRIER on old kernels
This change wraps the assumption in a function for better readability
and raises the minimum kernel version to 5.0 (that is when TUNSETCARRIER
was added).

Bug: 236783925
Test: atest EthernetManagerTest
Change-Id: Id84c793ccf2d02f77b3b398ae1ba717e6d12e7c9

Patrick Rohr   commited 2022-06-23 09:29:43 -07:00
e2e40d1379
Merge "Validate or set the eth specifier on update Iface"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-23 16:16:05 +00:00
85694dc277
Validate or set the eth specifier on update Iface
When a calling the updateInterface API, if no eth specifier was set it
would be removed not allowing follow-up network requests to request by
ethernet specifier.

This CL makes sure that the eth specifier is always set as expected when
updateInterface is called by either validating the input or setting the
specifier if the passed one is null.

Bug: 236294399
Bug: 229207021
Test: atest FrameworksNetTests
:com.android.server.ethernet.EthernetNetworkFactoryTest

Change-Id: Ic05ca7fe4adaa94f79e59758569f7595ab4c4f54

James Mattis   commited 2022-06-23 07:51:20 -07:00
59d98c07a7
Merge "Add wipeOnError flag to NetworkStatsRecorder"
Aaron Huang   authored and   Gerrit Code Review   commited 2022-06-23 06:14:42 +00:00
1934a82b52
Merge "Revert "connectivity_native_test: remove retries"" am: 749fd994f8 am: 8d48c6156b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2134515

Change-Id: Ib1c794e5cc0ccd7afa268463b16cf9bd4ba9beda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Steven Moreland   authored and   Automerger Merge Worker   commited 2022-06-22 21:04:16 +00:00
3ca526ccf8
Merge "Revert "connectivity_native_test: remove retries""
Steven Moreland   authored and   Gerrit Code Review   commited 2022-06-22 20:32:25 +00:00
749fd994f8
Revert "connectivity_native_test: remove retries"
This reverts commit ccde0db174.

Reason for revert: fails in mainline prod branch

Change-Id: Id26c44b9e9c68a259d3c82d67a5f4cea27569432

Steven Moreland   commited 2022-06-22 20:27:15 +00:00
5d0843b7f2
Merge "Skip testNetworkRequest_forInterfaceWhileTogglingCarrier on lower kernel version." am: 198bea7f24 am: c56815d17f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133171

Change-Id: I62c7182830eb19caeca65306960513f8261b1a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-22 14:30:53 +00:00
46a85881f6
Merge "Skip testNetworkRequest_forInterfaceWhileTogglingCarrier on lower kernel version."
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-22 13:47:54 +00:00
198bea7f24