Commit Graph

92672 Commits

Author SHA1 Message Date
Chalard Jean
84dfa9f104 Introduce a flag for using the carrier service changed callbacks.
Test: CarrierPrivilegeAuthenticatorTest
Change-Id: Ia28c6abca67866c1de953cb61953a0d2882cd7e2
2023-09-28 21:37:32 +09:00
Chalard Jean
a10ae005df Have DevSdkIgnoreRunner support @Parameterized parameters
Test: aosp/2405723 uses this, TH is happy with existing tests
Change-Id: If47d7e239d8483716fb78a97bbc2da4e24731209
2023-09-28 21:37:31 +09:00
Treehugger Robot
a2d60c355c Merge "Revert "RateLimitTest: temporarily dump ConnectivityThread if setUp fails"" into main am: dd3e7e0159
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765485

Change-Id: Ic62fe81c96febb8d560d303712dc942ce647362d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 23:50:11 +00:00
Treehugger Robot
bea15c6b27 Merge "Revert "RateLimitTest: temporarily dump ConnectivityThread if setUp fails"" into main am: dd3e7e0159
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765485

Change-Id: I152d3e981bd785b79a1ea18a2c1edb90bbc72ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 23:49:30 +00:00
Treehugger Robot
dd3e7e0159 Merge "Revert "RateLimitTest: temporarily dump ConnectivityThread if setUp fails"" into main 2023-09-27 22:51:34 +00:00
Treehugger Robot
06453bd65a Merge "OWNERS: master -> main" into main am: 66f39a5667
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765565

Change-Id: I5ded059a17bb94d816f4eb9b3d1041a842c78a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:48:00 +00:00
Maciej Żenczykowski
13e2ff7717 OWNERS: master -> main am: a1ab4aaeb5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765545

Change-Id: Ia9cedb7d9937c0d45fa8421e36ed865bc3aece62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:45:24 +00:00
Treehugger Robot
a6f78e46da Merge "OWNERS: master -> main" into main am: 66f39a5667
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765565

Change-Id: Ie4441cac99af2406add883a04457e133e8be3920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:45:17 +00:00
Maciej Żenczykowski
fd0faa8faf OWNERS: master -> main am: a1ab4aaeb5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2765545

Change-Id: I7fe17ae9d94d7885ff7ada233d35a5a283be15b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:45:06 +00:00
Treehugger Robot
66f39a5667 Merge "OWNERS: master -> main" into main 2023-09-27 19:31:13 +00:00
Maciej Żenczykowski
9ec09ec315 OWNERS: master -> main
Change-Id: I7912bf91841a4260d0a1eec022a6a832b312321d
2023-09-27 19:29:11 +00:00
Maciej Żenczykowski
a1ab4aaeb5 OWNERS: master -> main
Change-Id: Iad7d1818d1959024d5fd1fc8810d2b7ce0f06e40
2023-09-27 19:29:09 +00:00
Patrick Rohr
479dbbd906 Revert "RateLimitTest: temporarily dump ConnectivityThread if setUp fails"
This reverts commit cbe1755826.

Reason for revert: we found the culprit for the flakiness and b/272147742 is fixed.

Change-Id: I672c42bb57184393588666b6196f3a316f8c99c7
2023-09-27 19:20:58 +00:00
Andriy Naborskyy
f891a01eb5 Merge "wear proxy behind portal" into main am: 6aec2583cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762234

Change-Id: Ib5c5489b6abdf3427ccfa2112908b6d42ffd9961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:54:22 +00:00
Patrick Rohr
c571fa59f3 Merge "Unregister NetworkCallback in NetworkStatsManagerTest" into main am: 8d44250440
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762228

Change-Id: I11bd2a20dd901b8c1973d8f219d5df63a6973468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:51:10 +00:00
Andriy Naborskyy
00583cf109 Merge "wear proxy behind portal" into main am: 6aec2583cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762234

Change-Id: Iaf80ac98301cc90cd6245b4ba6282ccc8efda681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:51:09 +00:00
Patrick Rohr
a4400e505b Merge "Unregister NetworkCallback in NetworkStatsManagerTest" into main am: 8d44250440
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762228

Change-Id: I5f0a46071d53a7af094feaeb17509d0c2010cb76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:50:36 +00:00
Andriy Naborskyy
6aec2583cd Merge "wear proxy behind portal" into main 2023-09-27 17:39:30 +00:00
Patrick Rohr
8d44250440 Merge "Unregister NetworkCallback in NetworkStatsManagerTest" into main 2023-09-27 16:21:12 +00:00
Paul Hu
6df06daaec Store transaction id in MdnsPacket
The transaction id is a number that is used to identify a
specific query packet. But it's not necessary for probing
or announcing services, so the transaction id is not
currently used on advertising when creating a MdnsPacket or
decoding the response to a MdnsPacket. This means that it is not
possible to track which query packets have received
responses. Therefore, store the transaction id so that
it can be used for subsequent query packet changes.

Bug: 302269599
Test: atest FrameworksNetTests
Change-Id: I6734752b32b91678afb7df06e1fa51237cf70894
2023-09-27 18:20:28 +08:00
Motomu Utsumi
2359e7b554 Remove defaultEnabled arg from isNetworkStackFeatureEnabled
Test: NetworkStaticLibsTests
Bug: 279108992
Change-Id: Id5409158fd720efc92e1b39678e636a8a7d5a0a5
2023-09-27 17:39:31 +09:00
Motomu Utsumi
ed4e7ec954 Update the logic of isFeatureEnabled and isFeatureNotChickenedOut
If the flag value is unset or 0, isFeatureEnabled return false and
isFeatureNotChickenedOut return true.
If the flag value is -1 (force disable), both return false.
If the flag value is other values, both query the package version and
return `flagValue <= packageVersion`

Now the only difference is a default behavior when the flag is not set
or 0.
So isFeatureEnabled and isFeatureNotChickenedOut can use the same flag.

This CL also fixes the issue in rollback.
Before this CL, isFeatureNotChickenedOut did not check the module
version and could have a issue if there is a rollback.

Test: NetworkStaticLibsTests
Bug: 279108992
Change-Id: I12d6ebadff3aee7b7c614aca4eb0a34ef0db9857
2023-09-27 17:30:01 +09:00
Motomu Utsumi
195a30f02e Remove lint-baseline in staticlibs
Bug: 300384860
Test: TH
Change-Id: Ic26efebc24b3f7030b6ff66579fc0f5e5d019d5f
2023-09-27 17:24:30 +09:00
Motomu Utsumi
8ff87c846d Merge "cronet: Remove unused cronet_disabled api directory" into main am: 3f4bf87af6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745214

Change-Id: I2e9524cebcb571fad18c1e8ce9e6ceb5aa981ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 08:11:17 +00:00
Motomu Utsumi
54aacd4bed Merge "cronet: Remove unused cronet_disabled api directory" into main am: 3f4bf87af6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2745214

Change-Id: I10e69b8c4bb209f83ad63f7fe4c64898c9a69e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 08:11:04 +00:00
Motomu Utsumi
3f4bf87af6 Merge "cronet: Remove unused cronet_disabled api directory" into main 2023-09-27 07:42:45 +00:00
Andriy Naborskyy
d032dd42ea wear proxy behind portal
Do not avoid captive portal on wear proxy network; keep network agent
after detecting portal.

Bug: 291112432
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.ConnectivityServiceTest
Change-Id: I8f6669da62ebd76b6a46d2aec9b3ea563a08cb5e
2023-09-27 07:28:05 +00:00
Yuyang Huang
57c5a1c7bd Merge "Add @AppModeFull annotation to NsdManagerDownstreamTetheringTest" into main am: b01d0721a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2763305

Change-Id: I7c5bbfe1dab0e062594dc8b3531b00f0c7f9544e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 06:08:28 +00:00
Yuyang Huang
587fd7b162 Merge "Add @AppModeFull annotation to NsdManagerDownstreamTetheringTest" into main am: b01d0721a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2763305

Change-Id: I8954558da7186eaf6e15ce72e7557a4d0a7dc6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 06:08:11 +00:00
Yuyang Huang
b01d0721a2 Merge "Add @AppModeFull annotation to NsdManagerDownstreamTetheringTest" into main 2023-09-27 05:09:55 +00:00
Remi NGUYEN VAN
04085fd688 Merge "Nat464Xlat: rely on netd events being called on handler thread." into main am: d196fab898
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2763405

Change-Id: Ice4d84ec6ff98098475e21e8ae96052d1827903a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 03:03:52 +00:00
Remi NGUYEN VAN
7909964630 Merge "Nat464Xlat: rely on netd events being called on handler thread." into main am: d196fab898
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2763405

Change-Id: I48abcaeba074ae3f4d1a2492cc890d76d244e342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 03:03:36 +00:00
Chiachang Wang
e72c5a396c Remove Ikev2VpnProfile related shims usage
Ikev2VpnProfile related shims are no longer needed since
downstream branch was moved to udc branch. This commit
also update the methods that are used to do the SDK check
because of the removal of shims.

Test: atest CtsNetTestCases
Change-Id: I4efe65f87ace02b1f1649bf15ccf0ba06fd90486
2023-09-27 02:58:05 +00:00
Remi NGUYEN VAN
d196fab898 Merge "Nat464Xlat: rely on netd events being called on handler thread." into main 2023-09-27 02:01:58 +00:00
Patrick Rohr
f88fccde48 Unregister NetworkCallback in NetworkStatsManagerTest
NetworkStatsManagerTest issues NetworkRequests but does not release
them. In addition, it performs blocking operations inside the
onAvailable() callback that runs on the shared ConnectivityThread
impacting tests that run later.

Test: TH
Bug: 272147742
Change-Id: Ide2f5ba0b12752099d7665deaa9050463cd7ebee
2023-09-26 18:32:55 +00:00
Igor Zaslavsky
2d8debe62c Merge "Park RemoteAuth Manager and Service" into main am: f0afc53836
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2759205

Change-Id: I6e3f1ddf1d6c7f8e645a327f59e666851ccb4918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:20:50 +00:00
Igor Zaslavsky
22abe1ba04 Merge "Park RemoteAuth Manager and Service" into main am: f0afc53836
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2759205

Change-Id: I52409a1b45c325cf19804c568050511f25c150a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 18:19:27 +00:00
Igor Zaslavsky
f0afc53836 Merge "Park RemoteAuth Manager and Service" into main 2023-09-26 17:17:29 +00:00
Lorenzo Colitti
3b817cbad3 Nat464Xlat: rely on netd events being called on handler thread.
aosp/2724918 moved processing netd events for 464xlat to the
handler thread.

This CL makes 464xlat run the code that processes those events
inline. This simplifies the code and makes the ordering of events
more similar to what it was before.

Bug: 293965195
Fix: 302071735
Test: existing unit tests
Change-Id: I18b0d491aff94646b878a3d3488b5519fd42783c
2023-09-26 11:00:37 +00:00
Yuyang Huang
9244912a3f Add @AppModeFull annotation to NsdManagerDownstreamTetheringTest
Because the WifiManager can not be obtained in instant mode, the test
should only runs in AppModeFull.

Bug: 300219769
Test: TH
Change-Id: If5049a68dce23aafa3c9b8a59bf9a759c9532541
2023-09-26 18:57:25 +09:00
Treehugger Robot
047ec8ed52 Merge "Fix testSetOemNetworkPreferenceForTestPref flake" into main am: 8454fb5fed
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762789

Change-Id: I7af384374c2e87bf8e24a380fb675796dd6631d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 09:33:19 +00:00
Treehugger Robot
f4433fb01e Merge "Fix testSetOemNetworkPreferenceForTestPref flake" into main am: 8454fb5fed
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2762789

Change-Id: I48201f22282c5c7951710d97fb977432a0fb5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 09:33:06 +00:00
Treehugger Robot
8454fb5fed Merge "Fix testSetOemNetworkPreferenceForTestPref flake" into main 2023-09-26 08:43:15 +00:00
Treehugger Robot
d72e928dea Merge "Add QUERY_ALL_PACKAGES to FrameworksNetTestsLib" into main am: 20cb93aa5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2756186

Change-Id: I494d15ba85429177f3b96993779db1264aea04f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 08:40:46 +00:00
Treehugger Robot
194dc9cbd5 Merge "Add QUERY_ALL_PACKAGES to FrameworksNetTestsLib" into main am: 20cb93aa5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2756186

Change-Id: I822405023482ffab033f6dea73534778a7c7d498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 08:39:01 +00:00
Treehugger Robot
20cb93aa5d Merge "Add QUERY_ALL_PACKAGES to FrameworksNetTestsLib" into main 2023-09-26 07:28:01 +00:00
Motomu Utsumi
4d8c70c0eb Cleanup existing firewall rule on myUid before the test
testFirewallCloseSocketAllowlistChainOtherUid sets the firewall rule on
myUid + 1 and confirms this does not affect the network access from
myUid.
This test failed when there is an existing firewall rule on myUid.
This CL cleans up the existing rule on myUid before running the test and
restores the existing state after the test.

Bug: 299898772
Test: atest CtsNetTestCases
Change-Id: I9083ac41a64a8b81a8b4616c0d57a25355f5d53c
2023-09-26 15:52:34 +09:00
Chalard Jean
79adff3ae7 Fix testSetOemNetworkPreferenceForTestPref flake
The issue seems to be that some other network may become
available or change capabilities before Lost happens, as
can be the case with real networks like in CTS.

Test: TH
Bug: 289879931
Change-Id: I849f3b7d99f5d5195a3bbd3c39720923597a51d9
2023-09-26 14:51:05 +09:00
Jean Chalard
95535f528d Merge "Fix a socket leak" into main am: 3f48f42cb9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2761471

Change-Id: I8f779971b7acbccb8c0f026fb6105bf8938d17da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 04:07:08 +00:00
Jean Chalard
b0f705240d Merge "Fix a socket leak" into main am: 3f48f42cb9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2761471

Change-Id: I46486257bb8c6fe26364838f3b0b9b81ad9cfc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 04:06:43 +00:00