Commit Graph

10985 Commits

Author SHA1 Message Date
Chiachang Wang
d8970c3167 Merge "Add version control for packet address translation design" into main am: 89b25779e3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2677415

Change-Id: I91afc4efb2db81632a99d15e08313ba199a83084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 07:34:12 +00:00
Chiachang Wang
89b25779e3 Merge "Add version control for packet address translation design" into main 2023-08-03 06:58:28 +00:00
chiachangwang
144dd51761 Add version control for packet address translation design
This commit adds the version control for keepalive packet address
translation design to prevent device crash if the network stack
is not updated to a newer version. This commit also adds a
DeviceConfig to control the design in newer module version.

Bug: 291870956
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Id4efbf51dae9154d2bc3a1ee405e2139d5c91e36
2023-08-02 12:16:31 +00:00
Treehugger Robot
0fa9fdaf4d Merge "Address comments at aosp/2658225" into main am: 87d66ebd59
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676842

Change-Id: I9623b0188791485fa5cf30c0c5bc9f2ae01ed21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 09:47:21 +00:00
Treehugger Robot
87d66ebd59 Merge "Address comments at aosp/2658225" into main 2023-08-01 09:19:12 +00:00
Treehugger Robot
f2c956877f Merge "Deduplicate items after clear interface in NetworkStats" into main am: 865bfacab7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2664157

Change-Id: Ibf52519ed85148e4b758f0b7634e3fbfb8496c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 08:02:48 +00:00
Treehugger Robot
865bfacab7 Merge "Deduplicate items after clear interface in NetworkStats" into main 2023-08-01 07:40:57 +00:00
Motomu Utsumi
3b926ff492 Merge "Revert isDefaultNetworkActive behavior when there is no default network" into main am: dc9cb1da23
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2682750

Change-Id: I094890dc03dbb3d5aa70fc5d7f05db6b2092494e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 06:17:07 +00:00
Junyu Lai
a0991ebbfc Address comments at aosp/2658225
Test: This
Bug: 269409485
Change-Id: I6bfde26939e7cb5970f90fe5c663bcb55d3700d9
2023-08-01 14:12:55 +08:00
Motomu Utsumi
dc9cb1da23 Merge "Revert isDefaultNetworkActive behavior when there is no default network" into main 2023-08-01 05:49:47 +00:00
Junyu Lai
23d89c0bbf Deduplicate items after clear interface in NetworkStats
Follow-up from commit Ie60829a65d0d9b5b63ad353695a820c0586e3665,
the interface field was cleared before returning the result to
the caller. However, this can cause problems in the
NetworkStats#subtract method. If the interface field is cleared,
the findIndexHinted method can match to a wrong entry.
This is because the keys of multiple entries will now be the
same. This can cause the subtract result to be unexpectedly
large and the return value of getUidStatsForTransport to be
mismatched with the values retrieved from other APIs.

Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest \
      FrameworksNetTests:android.net.connectivity.android.net.NetworkStatsTest
Bug: 290728278
Change-Id: I891ab29b8a2902663febc7c32b04417caf510926
2023-08-01 13:38:26 +08:00
Motomu Utsumi
51e7a60359 Revert isDefaultNetworkActive behavior when there is no default network
aosp/2605757 updated isDefaultNetworkActive returns false when there is
no default network.
But this change was not merged to U release branch and this change was
not well tested by dogfooding.
So this CL reverts the isDefaultNetworkActivity behavior change.

Bug: 279380356
Bug: 291870075
Test: atest FrameworksNetTests
Change-Id: Id88662faea9eeaba93d59ab2729f6204a3631ab1
2023-08-01 12:50:00 +09:00
Motomu Utsumi
34c61b889b Merge "Revert onNetworkActive callback behavior on U+" into main am: 3f35bb2fce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2661517

Change-Id: Ic77b93093846c41ab58e1074ef91c680192954d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 11:00:28 +00:00
Motomu Utsumi
3f35bb2fce Merge "Revert onNetworkActive callback behavior on U+" into main 2023-07-31 10:34:41 +00:00
Motomu Utsumi
1e51a64988 Revert onNetworkActive callback behavior on U+
aosp/2605757 changed onNetworkActive callback behavior on U+ but this
change was not merged to U release branch.
This CL reverts the behavior change and keep the current behavior on U+.

Bug: 279380356
Bug: 291870075
Test: atest FrameworksNetTests
Change-Id: I91ccc7ee93f0827986401f316997b4a2df11318f
2023-07-31 19:33:24 +09:00
Chiachang Wang
6c75661f5a Merge "Deflake doTestPlatformVpnWithException related tests" into main am: 52f3e8f29e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2680456

Change-Id: I7304e4aaede3a54b46e8cccaf8ad4a69b4a7b7c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 09:36:15 +00:00
Chiachang Wang
52f3e8f29e Merge "Deflake doTestPlatformVpnWithException related tests" into main 2023-07-31 08:54:14 +00:00
chiachangwang
9f9a4dc69c Deflake doTestPlatformVpnWithException related tests
This commit updates test to
- Execute IkeSessionCallback inside executor. The callback should
  be called from executor in production code but test trigger the
  callback from test main thread which will result in unexpected
  code interaction.
- Verify the timer directly. The origin design verifies
  interactions with Captor with uncertain interaction. Test
  should be able to verify the schedule() calls with the expected
  timeout value. Also, in lower performance device, device may
  still process previous interaction. Add longer timeout to reduce
  flakes.

Bug: 293233390
Test: atest FrameworksNetTests
Test: atest VpnTest#testStartPlatformVpnFailedWithRecoverableError
      --rerun-until-failure 100
Change-Id: Ie42a2597a382800d6484a086b6d808490dfbdd32
2023-07-31 04:59:58 +00:00
Hansen Kurli
7f54a86493 Merge changes Ia5fc3e53,Ie1ab6013,I1cd5acb3 into main am: ebdda22240
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2639631

Change-Id: Ida46215c175114db8680cf88c52fcb00c004df28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 12:21:40 +00:00
Hansen Kurli
ebdda22240 Merge changes Ia5fc3e53,Ie1ab6013,I1cd5acb3 into main
* changes:
  Unregister BroadcastReceiver and OnSubscriptionsChangedListener.
  Disable KeepaliveStatsTracker before T.
  Disable KeepaliveStatsTracker instead of throwing.
2023-07-28 11:20:21 +00:00
Junyu Lai
775abbd245 Merge "Skip presubmit for flaky NetworkPolicy related tests due to Out of SLO" into main am: 24420ad536
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676619

Change-Id: Iaad6cdf8cd818a240e117c2fa7bb2b0d55742432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 06:05:44 +00:00
Mark Chien
5622bd0617 Merge "Fix EtherentTetheringTest flaky" into main am: 013425e27e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2679555

Change-Id: If20fc8a072373f2b0de50c0390e3af3d2928121e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 06:05:29 +00:00
Remi NGUYEN VAN
da6d4b116e Merge "Skip presubmit for flaky tests" into main am: dff0f956e3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676840

Change-Id: I23f9c3fb3fb9aeea9ff40741ff22bc9d45d26c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 06:04:58 +00:00
Junyu Lai
3f2d9c349a Merge changes from topic "hostsidevpntestflaky" into main am: a6be6cd48a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676837

Change-Id: I458a7ccf8fb6af4e512f43ac67f6918b659a6e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 05:44:50 +00:00
Junyu Lai
2d7ecc7f43 Skip presubmit for flaky tests in HostsideVpnTests due to Out of SLO am: 7eb00f79c3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676836

Change-Id: Ibad6e80160267a4226b23efd1ab881e38387dda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 05:44:45 +00:00
Junyu Lai
24420ad536 Merge "Skip presubmit for flaky NetworkPolicy related tests due to Out of SLO" into main 2023-07-28 05:26:51 +00:00
Mark Chien
013425e27e Merge "Fix EtherentTetheringTest flaky" into main 2023-07-28 04:29:42 +00:00
Remi NGUYEN VAN
dff0f956e3 Merge "Skip presubmit for flaky tests" into main 2023-07-28 03:38:33 +00:00
Junyu Lai
a6be6cd48a Merge changes from topic "hostsidevpntestflaky" into main
* changes:
  Skip presubmit for flaky tests in FrameworksNetTests due to Out of SLO
  Skip presubmit for flaky tests in HostsideVpnTests due to Out of SLO
2023-07-28 02:06:17 +00:00
Chiachang Wang
e1060032a8 Merge "Increase timeout to deflake tests" into main am: 32a8cbce6f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678020

Change-Id: Id7746400dc0e92e9e7917f1d57bd3c3cf997d2d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 01:57:18 +00:00
Chiachang Wang
32a8cbce6f Merge "Increase timeout to deflake tests" into main 2023-07-28 00:37:42 +00:00
Mark
f5e4b90ae2 Fix EtherentTetheringTest flaky
The first tethering test case may experience tethering restart
with IP conflict handling. Tethering would cache the last
upstreams so that the next enabled tethering avoids
picking up the address that is in conflict with the upstreams.
To protect subsequent tests, turn tethering on and off before
running them.

Bug: 254183718
Test: atest CtsTetheringTest
      atest MtsTetheringTestLatestSdk
Change-Id: I03729d3212a03bd9fcfe2c09cf327840f13b250c
2023-07-27 16:04:28 +00:00
Mark Chien
86b294dcd1 Merge "Fix ConnectivityManagerTest#testFactoryReset flaky" into main am: 734738767c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678017

Change-Id: I1530158b1aff98662347204c4e6d6d460ac8f042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:55:15 +00:00
Mark Chien
a8f822a0c3 Merge "Revert "Diable ConnectivityManagerTest#testFactoryReset"" into main am: 76edec4f97
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678016

Change-Id: I182e55c4a94e73dd4100e1adad33425a243a27a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 09:55:01 +00:00
chiachangwang
595fac0840 Increase timeout to deflake tests
In failed log, VPN still process the migration which does not
send the network capabilities update to network agent.
In low performance devices like cuttlefish, it may sometimes
cause flaky. Specify a longer timeout to deflake the test.

Bug: 293233390
Test: atest FrameworksNetTests
Change-Id: I4e6c80c03e19efb448ee2806c5a250425b0e068f
2023-07-27 09:17:00 +00:00
Mark Chien
734738767c Merge "Fix ConnectivityManagerTest#testFactoryReset flaky" into main 2023-07-27 09:11:20 +00:00
Mark Chien
76edec4f97 Merge "Revert "Diable ConnectivityManagerTest#testFactoryReset"" into main 2023-07-27 09:11:11 +00:00
Mark
5fab2d6c17 Fix ConnectivityManagerTest#testFactoryReset flaky
Listen SoftAp callback to make sure soft ap is disabled
before start hotspot.

Bug: 277856014
Test: atest ConnectivityManagerTest#testFactoryReset

Change-Id: I95050be703b7c97da7a14541ac74718fdcbd7f13
2023-07-27 03:40:39 +00:00
Remi NGUYEN VAN
8db52a5987 Skip presubmit for flaky tests
Skip presubmit for tests that have been reported to be >0.5% flaky in
presubmit, or in mainline-presubmit. Tests that only meet that criteria
in mainline-presubmit are only marked as @SkipMainlinePresubmit.

Ensure that the tests are still run in postsubmit so they can be moved
back to presubmit after getting fixed.

Test: TH
Bug: 284534251
Bug: 292174275
Bug: 292173706
Bug: 292174832
Bug: 289879947
Bug: 286701510
Bug: 293239598
Bug: 279846955
Bug: 277567450
Bug: 293239828
Bug: 293240365
Change-Id: I986a1079709057d3210016c50b632fe0f3bff1e2
2023-07-27 02:36:38 +00:00
Mark Chien
dfdc21bc6b Revert "Diable ConnectivityManagerTest#testFactoryReset"
This reverts commit f866acb6e7.

Reason for revert: enable the test

Change-Id: I00c2b32f0bf6fdb825d0edba8dcb74bcc7ad2fbf
2023-07-27 02:33:32 +00:00
Junyu Lai
0bfe4e6c96 Merge "Add test for benchmarking NetworkStatsRecorder" into main am: 5be6224203
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2658225

Change-Id: I890fc67860c70f8cbf0cfc68469d8a14b0c643d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 08:49:12 +00:00
Junyu Lai
7274332ff3 Skip presubmit for flaky NetworkPolicy related tests due to Out of SLO
Test: TH
Bug: 279052235
Bug: 279829773
Bug: 293225660
Change-Id: I68fe484e920c0c655176fc1909646c721c3eeefe
2023-07-26 16:43:42 +08:00
Junyu Lai
b8fc755259 Skip presubmit for flaky tests in FrameworksNetTests due to Out of SLO
Test: TH
Bug: 293233390
Change-Id: Ic1d0d86b3f8dfc8e8122c6b05973fab8b57e52b4
2023-07-26 16:31:46 +08:00
Junyu Lai
7eb00f79c3 Skip presubmit for flaky tests in HostsideVpnTests due to Out of SLO
Test: TH
Bug: 291701394
Change-Id: Iea67a9402f2712746c8e7424aacf66f82099700c
2023-07-26 16:20:09 +08:00
Junyu Lai
5be6224203 Merge "Add test for benchmarking NetworkStatsRecorder" into main 2023-07-26 07:43:14 +00:00
Mike Yu
f2f731ca13 Merge "Exclude some DnsResolverTest tests from some CtsNetTestCasesLatestSdk" into main am: 2657ee261f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618591

Change-Id: I6415d5a05da4876dd1a6be8e3d2aba63524951eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 04:21:19 +00:00
Mike Yu
2657ee261f Merge "Exclude some DnsResolverTest tests from some CtsNetTestCasesLatestSdk" into main 2023-07-26 03:17:08 +00:00
Paul Hu
26fc13c267 Merge "Report registration metrics data" into main am: 6be7db441c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2630031

Change-Id: I90032d8e10a0e2c9deeb36b2a1f620b7eb6fff88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:21:08 +00:00
Paul Hu
6be7db441c Merge "Report registration metrics data" into main 2023-07-26 00:45:34 +00:00
Treehugger Robot
7b1185faeb Merge "Add polling and logging when launcher is settings" into main am: 9a9852d782
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2664735

Change-Id: Ia37f2fd0b4771821784f5ba2bcc58081504b94d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 08:55:15 +00:00