Sudheer Shanka
ab6b38c90c
Temporarily include platform_compat service dump in failure logs.
...
Bug: 279829773
Test: TH
Ignore-AOSP-First: temporary change
Change-Id: I1f6795042f8a822359e089d7b9da4de0f8934a09
2023-05-08 06:16:42 +00:00
Sudheer Shanka
fbf94b9a52
Merge "Move the wait-for-barrier command to after the battery state change." into udc-dev
2023-05-03 23:15:33 +00:00
Sudheer Shanka
5c0d5a5c76
Move the wait-for-barrier command to after the battery state change.
...
The test should wait for broadcasts generated due to battery state
change to be dispatched before proceeding forward.
Bug: 279051330
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Ignore-AOSP-First: wait-for-broadcast-barrier is not available in AOSP
Change-Id: I2895907ebafb14eb38529a21b099ef73e1165c46
2023-05-03 10:07:00 +00:00
TreeHugger Robot
6ad488296a
Merge "Test the encap/timeout for the VCN" into udc-dev
2023-05-02 06:08:40 +00:00
Yuyang Huang
961b0dd155
Merge "Refactor the ISocketNetLinkMonitor to AbstractSocketNetlink" into tm-mainline-prod
2023-05-02 03:02:58 +00:00
Yuyang Huang
050b246600
Merge changes from topic "cherrypicker-L55500000960281927:N08100001362972784" into udc-dev
...
* changes:
[automerge] Refactor the ISocketNetLinkMonitor to AbstractSocketNetlink 2p: 46ab01cce9
Refactor the ISocketNetLinkMonitor to AbstractSocketNetlink
2023-05-02 03:02:58 +00:00
Chalard Jean
121ea1cc68
Test the encap/timeout for the VCN
...
Bug: 269715746
Test: VpnTest
(cherry picked from https://android-review.googlesource.com/q/commit:12740c9ff0ec53da1613f5949ab37d93d6e4ff88 )
Merged-In: I8e5e7a7eb09ee4d2e0a88193c5a6b1f0580d5eb8
Change-Id: I8e5e7a7eb09ee4d2e0a88193c5a6b1f0580d5eb8
2023-05-01 09:55:56 +00:00
TreeHugger Robot
227c350807
Merge changes from topic "empty-mac-onwakeupEvent" into udc-dev
...
* changes:
Add some tests for packet wakeup logging changes
Enable wakeup marking for Cellular transport
2023-04-28 21:06:43 +00:00
Suprabh Shukla
619549f37c
Add some tests for packet wakeup logging changes
...
Cellular networks are now supported for marking wakeup packets. As a
result onWakeupEvent now also reports data relevant to the cell
transport.
These unit tests should add coverage for these new behaviors.
Test: atest FrameworksNetTests
Bug: 276498460
Change-Id: I0b8a03fff6255e067b736f3dbfb53de56420f90b
Merged-In: I0b8a03fff6255e067b736f3dbfb53de56420f90b
2023-04-27 19:25:13 -07:00
Yuyang Huang
4a6186fa15
[automerge] Refactor the ISocketNetLinkMonitor to AbstractSocketNetlink 2p: 46ab01cce9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/22917791
Bug: 279692201
Change-Id: I60c900ada6902cffbd1a23fd17202c003f7c63c4
Merged-In: Ie07603ea51dda1ffdeb15f753bda7892d9137766
2023-04-28 02:10:58 +00:00
Yuyang Huang
46ab01cce9
Refactor the ISocketNetLinkMonitor to AbstractSocketNetlink
...
Test: atest CtsNetTestCases FrameworksNetTests
Bug: 279692201
(cherry picked from https://android-review.googlesource.com/q/commit:508e508ca63ce5449929343f28a99788fe7cfb0e )
Merged-In: Ie07603ea51dda1ffdeb15f753bda7892d9137766
Change-Id: Ie07603ea51dda1ffdeb15f753bda7892d9137766
2023-04-28 02:10:24 +00:00
Paul Hu
90125a914a
[automerge] Add MdnsServiceCache 2p: 9d9ae4d2a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/22905316
Bug: 265787401
Change-Id: Ibfd94af4fd5ef760394dc38c8ef95f9256b44799
Merged-In: If3d4eb4e3dc5455f6f97cb782aa1b99b2a00f6e0
2023-04-27 08:14:40 +00:00
Paul Hu
9d9ae4d2a1
Add MdnsServiceCache
...
Currently, the mDns discovery services will clear if no listener
registers to that MdnsServiceTypeClient. If an app does discover,
stop discover, resolve, at this point the listener was
unregistered, so the MdnsServiceTypeClient was deleted, and the
service is gone from cache. So this will actually restart
discovery without returning previous results from cache. Thus,
add MdnsServiceCache to store all services and reduce the
duplicated queries.
Bug: 265787401
Test: atest FrameworksNetTests
(cherry picked from https://android-review.googlesource.com/q/commit:ade3f459561f7dd2e1e66f82111c4e0e33fd3a4a )
Merged-In: If3d4eb4e3dc5455f6f97cb782aa1b99b2a00f6e0
Change-Id: If3d4eb4e3dc5455f6f97cb782aa1b99b2a00f6e0
2023-04-27 08:14:17 +00:00
Treehugger Robot
f45be89f0a
Merge "Make lingering delay 2000ms in testMultipleLingering" am: 47b95be1c9 am: 3c3f459a94
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2543150
Change-Id: Ia218f4165f269fab50ed0800830f6b1674b915ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 10:27:11 +00:00
Treehugger Robot
3c3f459a94
Merge "Make lingering delay 2000ms in testMultipleLingering" am: 47b95be1c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2543150
Change-Id: I067d6ade2fb8cb7726bab93757a356597c8e8211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 09:46:27 +00:00
Treehugger Robot
47b95be1c9
Merge "Make lingering delay 2000ms in testMultipleLingering"
2023-04-25 09:11:42 +00:00
Chalard Jean
aeadd47abc
Make lingering delay 2000ms in testMultipleLingering
...
Phenotype is updating the flags while this test is running
and this DoS'es the device to such an extent that the test
process doesn't get the CPU for more that 300ms. That lets
the lingering timeout run its course and fails the test.
This won't necessarily fix all flakes (after all, if
Phenotype hogs the CPU for 2 seconds the same issue will
continue to happen), but it should help.
Bug: 277555492
Test: FrameworksNetTests
Change-Id: I78ab1573974427b10dd557c011fbbf64942fd09f
2023-04-25 16:16:48 +09:00
Maciej Żenczykowski
d99b7dfc41
remove spurious libbpf_bcc am: c41291ba48 am: e246df8562
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2558550
Change-Id: I0ab93d5a6e0741302431991d2cf9898d15d3c83f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:12:38 +00:00
Maciej Żenczykowski
e246df8562
remove spurious libbpf_bcc am: c41291ba48
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2558550
Change-Id: If1f753cac2e1f9fc407c822cf224b4c9d403935e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 21:30:09 +00:00
Maciej Żenczykowski
c41291ba48
remove spurious libbpf_bcc
...
TreeHugger: builds
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Iaa0b513437d67aa61a38df410d8639f7fceed583
2023-04-24 20:10:00 +00:00
Treehugger Robot
830807b65c
Merge "Fix lint issues in NetworkAgentTest.kt." am: e1efcba6ad am: c32671677d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2554475
Change-Id: I43e97356d43dc5e6b09499cd4556985dd8e9a0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 12:28:49 +00:00
Treehugger Robot
c32671677d
Merge "Fix lint issues in NetworkAgentTest.kt." am: e1efcba6ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2554475
Change-Id: I0bfbe8c0acc2aab89d5282fc177fe9fbef47ee33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 11:47:24 +00:00
Treehugger Robot
e1efcba6ad
Merge "Fix lint issues in NetworkAgentTest.kt."
2023-04-24 11:05:14 +00:00
Lorenzo Colitti
66276f91c2
Fix lint issues in NetworkAgentTest.kt.
...
The linter is complaining about the import ordering.
Bug: 143158421
Test: TH (no code changes)
Change-Id: If9fefb9ece86fa24cb4b3f28c088c0b6820a1049
2023-04-24 18:00:07 +09:00
Hansen Kurli
2a7acb091a
Merge changes I727849fa,If31ccbc7 am: 22a0120260 am: 05199abdb0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2530779
Change-Id: I0a50cb9e53faa54598ad04824cfaa70a1bbecf94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 05:27:15 +00:00
Hansen Kurli
05199abdb0
Merge changes I727849fa,If31ccbc7 am: 22a0120260
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2530779
Change-Id: I4e772774a0b7aecf23e1bff20dc7ca539544eda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 04:48:36 +00:00
Hansen Kurli
22a0120260
Merge changes I727849fa,If31ccbc7
...
* changes:
Refactor buildKeepaliveMetrics to return DailyKeepaliveInfoReported
Create KeepaliveStatsTracker for Duration metrics.
2023-04-24 04:03:09 +00:00
Treehugger Robot
651fae821a
Merge "Don't run PacProxyManagerTest case without WebView support." am: d8321ef84f am: 75bf92b1f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2536890
Change-Id: I57ed9520ed58e1410ac39dd99846d748a823f806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 02:41:12 +00:00
Treehugger Robot
75bf92b1f2
Merge "Don't run PacProxyManagerTest case without WebView support." am: d8321ef84f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2536890
Change-Id: Iedd786f3039d46a4ea9419b0c55c6ea0899f099e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 01:59:07 +00:00
Treehugger Robot
d8321ef84f
Merge "Don't run PacProxyManagerTest case without WebView support."
2023-04-24 01:26:11 +00:00
Paul Hu
cd15213411
Merge changes from topic "revert-2542434-revert-2535219-TAMNEZLAHT-VPTOBCYDEB" am: 700de306ef am: b94412a272
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2542833
Change-Id: I1ecd618186e02cacb17d03f70a524127f8b8925b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 15:53:16 +00:00
Paul Hu
b94412a272
Merge changes from topic "revert-2542434-revert-2535219-TAMNEZLAHT-VPTOBCYDEB" am: 700de306ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2542833
Change-Id: Ib228a7ba13d42b2ccf7761205b8bcac93831c211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 15:13:21 +00:00
Paul Hu
700de306ef
Merge changes from topic "revert-2542434-revert-2535219-TAMNEZLAHT-VPTOBCYDEB"
...
* changes:
Revert^2 "Put client logs into SharedLog and dump more logs"
Revert^2 "Record Advertiser history logs for better debugging"
Revert "Revert "Record SocketProvider history logs for better de..."
Revert "Revert "Record DiscoveryManager history logs for better ..."
2023-04-21 14:35:45 +00:00
Motomu Utsumi
132a24e49d
Merge "Avoid activity restart by config changes while test" am: cf8d28a8ff am: ecf4d610e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2554191
Change-Id: I86d5ef50276d5be60994fa0be9e1836189ee777d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 11:41:50 +00:00
Motomu Utsumi
ecf4d610e7
Merge "Avoid activity restart by config changes while test" am: cf8d28a8ff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2554191
Change-Id: I51fd6399a2862d14b4305803fe87eb4a01b99089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 11:02:09 +00:00
Motomu Utsumi
cf8d28a8ff
Merge "Avoid activity restart by config changes while test"
2023-04-21 10:23:05 +00:00
Motomu Utsumi
037e614371
Avoid activity restart by config changes while test
...
hostside/VpnTest assumes MyActivity launched at setup is not destroyed.
Test fails if the activity is restarted since mActivity in VpnTest
refers to the destroyed activity and mActivity.getResult can not return
result from vpn dialog.
Configuration changes specified in android:configChanges will not
restart activity but call Activity#onConfigurationChanged.
Test: atest com.android.cts.net.HostsideVpnTests#testSocketClosed
Bug: 277344807
Change-Id: Ia26e3c6495be63191bbfe6378c246ffb6d15be5a
2023-04-21 15:18:40 +09:00
Treehugger Robot
7f7ce481f9
Merge changes I33bc80cc,Ie84e2cd4 am: fd402476f1 am: 0d3d27ecc1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2384592
Change-Id: I42ea6b11578823dd3adf7768edee98c992127e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 19:54:54 +00:00
Treehugger Robot
0d3d27ecc1
Merge changes I33bc80cc,Ie84e2cd4 am: fd402476f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2384592
Change-Id: Id8d9a686e729b920826f0b6e205f770768585925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 18:32:02 +00:00
Treehugger Robot
fd402476f1
Merge changes I33bc80cc,Ie84e2cd4
...
* changes:
EthernetManagerTest: update tests that bring up tap without carrier
TestNetworkService: use IFF_NO_CARRIER to bring up iface without carrier
2023-04-20 18:01:28 +00:00
Chiachang Wang
36ad8fed76
Merge "Remove unnecessary mocking in tearDown" am: 520417cc3e am: 1c370c647a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2550152
Change-Id: I9d8b1b2126c3c3ec2e3e3bc0a96f94af26d74577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 13:21:03 +00:00
Chiachang Wang
1c370c647a
Merge "Remove unnecessary mocking in tearDown" am: 520417cc3e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2550152
Change-Id: Ibcc04d0633dfe96900c0181d97b390c159dd28b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 12:40:41 +00:00
chiachangwang
3dcfdd0642
Remove unnecessary mocking in tearDown
...
The setup for the mocking object will be reset when each test
finishs the test. Reset the mocking value is actually no-op
but cause possible threading issue in Mokito.
Bug: 278979735
Test: atest com.android.server.connectivity.VpnTest \
--rerun-until-failure 100
Change-Id: Ib8c3813e5dbcc9b7432a5548766d63e400b4ed0e
2023-04-20 09:43:40 +00:00
Calvin On
6b254d5649
Don't run PacProxyManagerTest case without WebView support.
...
PAC proxies rely on the Javascript interpreter in WebView, so
devices without WebView cannot support PAC proxies.
Bug: 253978428
Test: atest CtsNetTestCases
Change-Id: I3905a8f0cfc0518db994d0e417ed107163523c1d
2023-04-20 01:47:11 +00:00
Motomu Utsumi
e0df590c27
Merge "Move fail in testFirewallBlocking" am: e74c7b6936 am: fe95c3d703
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2542990
Change-Id: Ia728773563bc4a17d30aec0b2a82bab0722e0fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 04:50:48 +00:00
Motomu Utsumi
fe95c3d703
Merge "Move fail in testFirewallBlocking" am: e74c7b6936
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2542990
Change-Id: Ib7acf7350b713809fc32b21fb42c04478ac1a4f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 04:05:52 +00:00
Motomu Utsumi
e74c7b6936
Merge "Move fail in testFirewallBlocking"
2023-04-19 03:20:23 +00:00
Paul Hu
551c75b474
Merge "Fix flaky test: testSetOemNetworkPreferenceForTestPref" am: 4402d99296 am: d14cfd26db
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065429
Change-Id: I1e8af9b48d26416e7e34e2572e837837807ef82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 09:45:33 +00:00
Paul Hu
d14cfd26db
Merge "Fix flaky test: testSetOemNetworkPreferenceForTestPref" am: 4402d99296
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065429
Change-Id: I0881bae7910a60ec97f094f9755f942786aaaded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 09:23:52 +00:00
Paul Hu
4402d99296
Merge "Fix flaky test: testSetOemNetworkPreferenceForTestPref"
2023-04-18 09:08:18 +00:00