Commit Graph

10985 Commits

Author SHA1 Message Date
Jean Chalard
8fa5a9f88d Merge "Restore ConnectivityManagerTest into presubmits" into main am: 05a82947f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709078

Change-Id: I4d614b669319b9ccdaaa931281dd64ed8e1c91cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 10:11:42 +00:00
Jean Chalard
940e330f5d Merge "Request enterprise networks" into main 2023-08-28 09:20:34 +00:00
Jean Chalard
05a82947f3 Merge "Restore ConnectivityManagerTest into presubmits" into main 2023-08-28 09:20:02 +00:00
Chiachang Wang
845a91cc31 Verify VPN underlying network is set as soon as it tries to use it
Bug: 289606688
Test: atest FrameworksNetTests
Change-Id: Ib35a63ac5f68599c646afad5cad68c1753fb732f
2023-08-28 08:00:20 +00:00
Yuyang Huang
892f303e87 Disable "next" targets in module release branch
The "next" targets are not necessary in the module release branch.

This should not be (auto)merged in development branches.

Ignore-AOSP-First: module release branch-only change
Merged-In: Iaa8b203660518e30c74d37a4322b45380df14835
Test: m
Change-Id: If6b3352f2c3cb73dd713a503b1d3b696eb3beeb4
2023-08-28 16:12:36 +09:00
Xin Li
4a6c653160 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: Iff29b090c0b41d0103997a80788f09c2602df074
Change-Id: I5b03523defc88ffbc3aeab9ac8a29b4ca5a11f57
2023-08-25 13:52:17 -07:00
Paul Hu
e713e20b56 Merge changes I47b91c0c,I630c0e49 into main am: 1b5d601d0c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2672498

Change-Id: Iab1050f2819fc12a2e32786facaa3cb638de3ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 15:37:19 +00:00
Paul Hu
1b5d601d0c Merge changes I47b91c0c,I630c0e49 into main
* changes:
  Report sent query count
  Report service info callback metrics data
2023-08-25 14:46:39 +00:00
Treehugger Robot
a433ea9980 Merge "Skip tests in CtsNetTestCases module if feature not supported" into main am: cae5209d5a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2373610

Change-Id: I9c462cc274bbb62fbc7c7caa36f6bcf7c66c8938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 14:15:19 +00:00
Treehugger Robot
cae5209d5a Merge "Skip tests in CtsNetTestCases module if feature not supported" into main 2023-08-25 13:37:03 +00:00
Treehugger Robot
37115a55d9 Merge "Add some tests back which were removed for fixing kotlin nullable errors" into main am: 760bcac429
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2720876

Change-Id: I162caeb1feec8ca133f54d7d09e9088c4fe497a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 05:00:53 +00:00
Treehugger Robot
760bcac429 Merge "Add some tests back which were removed for fixing kotlin nullable errors" into main 2023-08-24 04:14:28 +00:00
Motomu Utsumi
5324475f6e Add some tests back which were removed for fixing kotlin nullable errors
Followup CL for aosp/2700076

Bug: 296972712
Test: build with aosp/2688146
Change-Id: I617b330c42a99e4c839adac2ea614756b5955ce9
2023-08-24 11:25:21 +09:00
Patrick Rohr
a7ff08ef9d Merge changes I2399960f,I7b6e1a3b into main am: 0466125e93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2721684

Change-Id: I4252f3e8a5232881c67c4886286e4490bf4cd82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 16:41:03 +00:00
Patrick Rohr
8b3f8e5601 Grant prohr ownership of ethernet tests am: 88a88f1304
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2593625

Change-Id: Id9ec08c6c7c1dd075f145e7bfe5333c10ca9d5ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 05:17:54 +00:00
Patrick Rohr
f454f89354 ethernet: clean up EthernetManagerTest
createChangeEvent is not expected to be called from a test, so make it
private. Also delete pollOrThrow as polling inline creates a better log
output.

Test: atest EthernetManagerTest
Change-Id: I2399960fee2c51fdf340186189ae83a20c4ac6f3
2023-08-22 12:39:36 -07:00
Patrick Rohr
f848c6c689 ethernet: test adding listener after removing server mode iface
Tests that registering a EthernetStateListener functions as expected
after requesting a tethering interface and subsequently removing that
interface.

Test: atest testCallbacks_afterRemovingServerModeInterface
Bug: 290971780
Change-Id: I7b6e1a3b3ac23f4fbdd2d20f63f83d59c4d4999d
2023-08-22 12:37:58 -07:00
Patrick Rohr
88a88f1304 Grant prohr ownership of ethernet tests
Test: N/A
Change-Id: I50101f9e5dc4dede5732a31da4ecd53d027adedc
2023-08-22 12:37:43 -07:00
Manidhar
d41d7b6af2 Skip tests in CtsNetTestCases module if feature not supported
Test cases are accessing wifi when WiFi feature not enabled.
This change skips the test from executing based on WiFi feature
availabiliy.

Bug: 262228635
Test: Executed all CtsNetTestCases tests on system with and without WiFi
feature

Change-Id: I97872cf7b73eed12dba064697150f09c81f494b6
2023-08-22 12:44:55 +00:00
Paul Hu
bad6fe9835 Report sent query count
Report the sent query count when the discovery is stopped.

Bug: 287546772
Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I47b91c0c530eee2f00920ee5ea99e8d7b6e2e9ee
2023-08-22 17:26:27 +08:00
Treehugger Robot
f3e0ecacfe Merge "Ignore EXCLUDED_ROUTES LinkPropertiesTest up to S_V2" into main am: b5208bad3e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2720158

Change-Id: I26117dd8ef3823dcf5e42505aa6e2704e695880f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 08:56:29 +00:00
Treehugger Robot
b5208bad3e Merge "Ignore EXCLUDED_ROUTES LinkPropertiesTest up to S_V2" into main 2023-08-22 08:19:25 +00:00
Paul Hu
ddce5919af Report service info callback metrics data
Bug: 287546772
Test: atest FrameworksNetTestCases
Change-Id: I630c0e4921f7acf42bf29812d9790ee5a894d60b
2023-08-22 15:25:37 +08:00
Yuyang Huang
7fe61f4cbd Ignore EXCLUDED_ROUTES LinkPropertiesTest up to S_V2
The platform doesn't allow overwriting compat flags that have target SDK
lower than the platform SDK in release build. Ignoring the test cases
that need compat flag overwrite up to S_V2 makes the MTS pass on S
device.

Bug: 296248982
Test: TH
Change-Id: Iab102725004c39b4dc3c0200c9bc673dd6be1302
2023-08-22 15:17:38 +09:00
Colin Cross
a8c98c6dd9 Merge "Fix kotlin nullable errors in Connectivity tests" into main am: d5038a042c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2700076

Change-Id: Ic4c50714916732ac89071566ac326a5dac15cdf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 04:42:55 +00:00
Colin Cross
d5038a042c Merge "Fix kotlin nullable errors in Connectivity tests" into main 2023-08-22 04:13:01 +00:00
Patrick Rohr
48643695a2 Merge changes from topic "trackrecord-backtrace" into main am: c45928b35b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2700956

Change-Id: I3c9c2c44c2064ce692d9fae4ca8369f053ea9522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 14:35:22 +00:00
Patrick Rohr
c45928b35b Merge changes from topic "trackrecord-backtrace" into main
* changes:
  ethernet: use TrackRecord backtrace for better failure logs
  ethernet: correctly report tethering interface state
  ethernet: add missing assert in eventuallyExpect helper
2023-08-18 14:10:21 +00:00
Treehugger Robot
e5e66631aa Merge "Report resolution stop" into main am: aa4db9753b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2682746

Change-Id: I7846576bcd1f8f3e74842a2c290073933072fd64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 10:03:36 +00:00
Treehugger Robot
aa4db9753b Merge "Report resolution stop" into main 2023-08-18 09:30:26 +00:00
Paul Hu
6014905672 Report resolution stop
Report the nsd metrics event of resolution stop.

Bug: 287546772
Test: atest FrameworksNetTestCases
Change-Id: I2e6de22c946d58a3410f16b2f2689fd3ffc635a4
2023-08-18 11:59:06 +08:00
Paul Hu
25c9d75255 Merge "Stop the created handler threads on the tests" into main am: a436faf92d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2714054

Change-Id: I1b273f03b804dbf57be2618b845211427da2b614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 03:07:12 +00:00
Paul Hu
a436faf92d Merge "Stop the created handler threads on the tests" into main 2023-08-18 02:40:45 +00:00
chiachangwang
7b2badce8b Add tests in Ikev2VpnTest back to presubmit am: 739f3c7ae9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709080

Change-Id: I742686d0d4f2580a8fe5ff918b884de6945aa659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 01:12:23 +00:00
chiachangwang
739f3c7ae9 Add tests in Ikev2VpnTest back to presubmit
Those tests are no longer flaky after fix being merged, so add
them back to presubmit.

Fix: 293239828
Test: atest CtsNetTestCases:android.net.cts.Ikev2VpnTest \
      --rerun-until-failure 100
Change-Id: I3e5b0f8053404b8840e8ce67ea82344ab53ce421
2023-08-18 00:41:55 +00:00
Chiachang Wang
5b6637208f Merge "Stop the created handler threads" into main am: 033ca4c8cf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2713895

Change-Id: Ib2e6d66e471107863bd57f366505b656a8a1f2ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 10:00:40 +00:00
Chiachang Wang
033ca4c8cf Merge "Stop the created handler threads" into main 2023-08-17 09:40:05 +00:00
Paul Hu
f6e1867963 Stop the created handler threads on the tests
The created handler thread will stay there for a while until
all the tests are finished. This is considered as a leakage
which will take the resource from the devices. In low end
devices, this may possibly impact the performance. The created
threads should be closed explicitly.

Test: atest FrameworksNetTests
Change-Id: Id5faceec341578f1c9757194c91a433fbb3f657f
2023-08-17 06:53:16 +00:00
Motomu Utsumi
d5b7e2c263 Merge "Use isTetheringFeatureNotChickenedOut for kill switch" into main am: 23b0bab6b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709174

Change-Id: Ie5b2ee5447486e39d612a9a89f9bc561e172f23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 06:50:14 +00:00
chiachangwang
8d336eb1a3 Stop the created handler threads
The created handler thread will stay there for a while until
all the tests are finished. This is considered as a leakage
which will take the resource from the devices. In low end
devices, this may possibly impact the performance. The created
threads should be closed explicitly.

Test: atest FrameworksNetTests
Change-Id: I332d55d8effdb975fd9a8953b19910a7fb25e426
2023-08-17 06:18:46 +00:00
Motomu Utsumi
23b0bab6b1 Merge "Use isTetheringFeatureNotChickenedOut for kill switch" into main 2023-08-17 06:13:21 +00:00
Paul Hu
884605ce7c Merge "Report resolution metrics data" into main am: 69a18c6f90
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2637730

Change-Id: Iaff6eb1d8f511d04b3c81e2cb5d432ca149be9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 03:49:07 +00:00
Paul Hu
69a18c6f90 Merge "Report resolution metrics data" into main 2023-08-17 02:57:45 +00:00
Motomu Utsumi
0a50c65f75 Use isTetheringFeatureNotChickenedOut for kill switch
Following CLs remove the default value from isFeatureEnabled since the
default value was difficult to use correctly.
For example, there was a code that use isAtLeastT() as default value and
expect feature is always enabled on T+ devices.
However, default value is used only when the device does not have the
flag value or flag value is 0.
So the expectation that the feature is always enabled on T+ devices is
not correct if flag is pushed to the device by mistake or the device is
upgraded from S to T but the flag value is not cleared.
If the feature should be always enabled on T+ devices, `isAtleastT() ||
isFeatureEnabled()` should be used instead of `isFeatureEnabled(
isAtleastT() /* defaultValue*/ )`

After the default value argument is removed from isFeatureEnabled,
isFeatureEnabled is used for default false flag and
isTetheringFeatureNotChickenedOut is used for default true kill switch flag.

automatic_on_off_keepalive_version flag is not configured and devices
don't have this flag value.
So updating to use isTetheringFeatureNotChickenedOut should not have any
behavior change.

Test: m
Bug: 279108992
Change-Id: I43ceab6cc5234bd5a43af3acbd7bd7344844c5a6
2023-08-16 20:15:52 +09:00
Treehugger Robot
1ccbb2d274 Merge "Report discovery metrics data" into main am: 238efa1070
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2628995

Change-Id: I2eec2710363937253934297b886af603325672b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 10:05:25 +00:00
Treehugger Robot
238efa1070 Merge "Report discovery metrics data" into main 2023-08-16 09:28:25 +00:00
Paul Hu
a6bc463155 Report resolution metrics data
Collect information on resolution success and failure events,
then use this data to build metrics and report them.

Bug: 287546772
Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I373ce91fea9d5a278f53fc0c505be90dd39b2d5b
2023-08-16 15:53:06 +08:00
Paul Hu
812e9217b9 Report discovery metrics data
Collect information on discovery start, failure, and stop events,
then use this data to build metrics and report them.

Bug: 287546772
Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I2f6a718024870f9658cfeabe8995624a3ad81f05
2023-08-16 15:09:17 +08:00
Remi NGUYEN VAN
c6501d1e07 Merge "Add tests for conflicts" into main am: 0f30ec683f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2397457

Change-Id: I4d8518f40cabfe20a9fac5de68d0f97a50d3ca69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 04:04:09 +00:00
Remi NGUYEN VAN
0f30ec683f Merge "Add tests for conflicts" into main 2023-08-16 04:01:30 +00:00