Commit Graph

10985 Commits

Author SHA1 Message Date
Sudheer Shanka
4834a64d76 Merge "Avoid hardcoding BATTERY_PLUGGED_ANY constant." am: bdd3ca1ac6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2609416

Change-Id: I14882d80d55287e6278c60109b317c2c23948042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 19:56:51 +00:00
Sudheer Shanka
bdd3ca1ac6 Merge "Avoid hardcoding BATTERY_PLUGGED_ANY constant." 2023-05-31 19:19:11 +00:00
Yuyang Huang
276d8f8e3a Merge "Matches all MdnsServiceTypeClient if using MdnsSocketClient" am: c2baf9403a am: bd3e3ec1b7 am: 5f5a283e80
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606592

Change-Id: I3d2e99652f830bcc1d6484f5ba26114d08cd1cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 13:10:54 +00:00
Yuyang Huang
6ac477d6cb Merge "Matches all MdnsServiceTypeClient if using MdnsSocketClient" am: c2baf9403a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606592

Change-Id: I5d274463e68c0f3120d83ce5d35be452b35d108e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 11:17:27 +00:00
Yuyang Huang
c2baf9403a Merge "Matches all MdnsServiceTypeClient if using MdnsSocketClient" 2023-05-31 10:14:32 +00:00
Mark Chien
6238d2a081 Merge "Add CtsTetheringTestLatestSdk into mainline-presubmit" am: 72fe588d45 am: 8ee60a3677 am: 19a5a2392a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2164002

Change-Id: I91275af96117a54f7f8ca436bc9ca5d5e6fd8b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 07:56:36 +00:00
Yuyang Huang
d72daab448 Matches all MdnsServiceTypeClient if using MdnsSocketClient
MdnsSocketClient doesn't support requesting specific network. As a
result, when processing the response, all the MdnsServiceTypeClient
should be called.

Bug: 285064577
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: Id95f1e78d60063ccee7f5855a21fa6b5a48fbd3e
2023-05-31 15:39:08 +09:00
Mark Chien
80487cffa2 Merge "Add CtsTetheringTestLatestSdk into mainline-presubmit" am: 72fe588d45
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2164002

Change-Id: I6aa9c940b4f1f46184d65c2b6b49d059ebb5c588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 06:25:25 +00:00
Mark Chien
72fe588d45 Merge "Add CtsTetheringTestLatestSdk into mainline-presubmit" 2023-05-31 06:13:31 +00:00
Mark Chien
f8870fa7af Add CtsTetheringTestLatestSdk into mainline-presubmit
Also test CtsTetheringTestLatestSdk on physical devices
physical SIM in mainline-post

Test: TH

Change-Id: Ia9806c46fbe49282017011ea6ca414e2c58fe00b
2023-05-31 03:50:26 +00:00
Treehugger Robot
bb4c717fbb Add MdnsDiscoveryManager constructor without looper
In some use cases for the MdnsDiscoveryManager, providing looper as an
argument to the MdnsDiscoveryManager constructor is not feasible. Adding
a constructor without looper can help to match those use cases. If
constructor without looper is used. The shutDown() must be called as a
part of cleanup process.

Original change: https://r.android.com/2600006

Change-Id: I412157f184decd8af8343977d59a2215fe8ca51e
Fixes: 283914408
Test: atest FrameworksNetTests
Merged-In: I0ab04d67bae127628c6d67c4b8c109201612a54b
2023-05-31 01:42:41 +00:00
Paul Hu
901e5b1332 Pass NsdService thread looper to MdnsDiscoveryManager
MdnsDiscoveryManager should use the same thread that create on
NsdService that is used on other mDns components. Thus, pass that
thread loop to MdnsDiscoveryManager.

Bug: 265787401
Test: atest FrameworksNetTests
(cherry picked from https://android-review.googlesource.com/q/commit:7f0af78c5ee0b783faec38ab4dd7afe0f8a393ec)
Merged-In: Icc23994c3ebc99da6043ed2d93540c44f53a150b
Change-Id: Icc23994c3ebc99da6043ed2d93540c44f53a150b
2023-05-31 01:41:30 +00:00
Sudheer Shanka
234c2895e8 Avoid hardcoding BATTERY_PLUGGED_ANY constant.
Bug: 284904539
Test: TH
Change-Id: I8685f8008fd4a431136ef2900b45509f2ef7cc0b
2023-05-30 21:51:29 +00:00
Treehugger Robot
4db9ed5196 Merge "Add MdnsDiscoveryManager constructor without looper" am: ae9b229b7e am: 3e3745f84a am: 22cc0b3c32
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2600006

Change-Id: I0c686f2fe95a620fca24c1ece72857c57e3c2e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 12:43:13 +00:00
Hansen Kurli
76adfacd84 Add tests for NATT keepalives stopped internally in KeepaliveTracker.
Add tests where NATT keepalives are stopped and cleaned up within
KeepaliveTracker in these scenarios:
1. startNattKeepalive is called with an invalid interval.
2. The state is STARTING and the network agent returns an error event.
3. The keepalive started successfully but becomes invalid and
   handleCheckKeepalivesStillValid is called on the network.

Bug: 281646074
Test: atest FrameworksNetTests
Change-Id: Iadf9f06030cae20f36d950f520c8dcc4181924ad
2023-05-30 11:27:11 +00:00
Treehugger Robot
0e8818801a Merge "Add MdnsDiscoveryManager constructor without looper" am: ae9b229b7e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2600006

Change-Id: I80efce0bc328d29d27a39de266c9f271343d4b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:14:29 +00:00
Treehugger Robot
ae9b229b7e Merge "Add MdnsDiscoveryManager constructor without looper" 2023-05-30 10:24:27 +00:00
Yuyang Huang
243d1a5de4 Add MdnsDiscoveryManager constructor without looper
In some use cases for the MdnsDiscoveryManager, providing looper as an
argument to the MdnsDiscoveryManager constructor is not feasible. Adding
a constructor without looper can help to match those use cases. If
constructor without looper is used. The shutDown() must be called as a
part of cleanup process.

Bug: 283914408
Test: atest FrameworksNetTests
Change-Id: I0ab04d67bae127628c6d67c4b8c109201612a54b
2023-05-30 17:14:54 +09:00
Aaron Huang
40b524448c Add tests for PAC proxies.
Test: this is a change that adds a test
Bug: 138810051
Bug: 140610528
Change-Id: I6e7b77320f6baf32ac2f98634fa2e3231d1bf12f
2023-05-30 15:53:11 +09:00
Jean Chalard
4212bf3ec0 Merge "Instrument SDK level and change IDs to help testing" am: 5cc9676d4c am: 2d280e5389 am: f62a06ea96
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606676

Change-Id: I8975715af7dd0b1406b5bf552231d6097850a964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:25:39 +00:00
Jean Chalard
3109cb3479 Merge "Instrument SDK level and change IDs to help testing" am: 5cc9676d4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606676

Change-Id: I22a19e807dfbd95b2ee3d66c1be898ce3b62b3d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 02:59:46 +00:00
Jean Chalard
5cc9676d4c Merge "Instrument SDK level and change IDs to help testing" 2023-05-30 02:10:05 +00:00
Chalard Jean
df29a85ee7 Instrument SDK level and change IDs to help testing
This patch mocks the SDK level and/or change IDs to help
developing functionality that depends on these without
having to flash a new device every time.

Test: TH
Change-Id: I1011193c99e123a0e5501ed313c9cecbceebdae6
2023-05-29 18:42:31 +09:00
Yuyang Huang
79a245e16f Update the SDK version to 34 in ConnectivityTestsLatestSdkDefaults
NsdManagerTest need to be updated because the older check was incorrect,
the new behavior should be observed on T when the compat flag is enabled
as well.

Test: m
Change-Id: I5d2e87b1ab5a114005a223e7ccd865540c0fdb78
2023-05-29 15:31:45 +09:00
Remi NGUYEN VAN
de0cbe8e2a Merge "Do not process null network packets on all clients" am: f4cf2707e7 am: 9deb915de1 am: 66ccb1f36d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2602192

Change-Id: I4114401a2caabfb58b87499031088b77ba47c810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-29 06:02:28 +00:00
Remi NGUYEN VAN
331b2a60d8 Merge "Only send to downstream ifaces for null network" am: 5a1c614e42 am: 34918c033e am: 768971ad6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2598346

Change-Id: Idbcc5102d573e1399cd52b43c72c95a2f22e8ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-29 06:02:19 +00:00
Remi NGUYEN VAN
d10b7d14e1 Merge "Use the ServiceTypeClient network for queries" am: 401ab44c36 am: 88d3fcd169 am: 41e828650d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2598345

Change-Id: I63d06ec794cb2ee4558c85fabd7c35f3804869cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-29 06:02:07 +00:00
Remi NGUYEN VAN
574494d7c5 Do not process null network packets on all clients
Packets received from the "null" networks are packets received from
tethering downstream interfaces. They should not be processed by all
MdnsServiceTypeClients; instead they should be processed by
the MdnsServiceTypeClient for the null network.

Bug: 283708537
Test: atest
(cherry picked from https://android-review.googlesource.com/q/commit:0ba206cbd168f5627da84911c0d7e5307e55c431)
Merged-In: Ifef59eca7a24bdfe3650067445d2565869dfa852
Change-Id: Ifef59eca7a24bdfe3650067445d2565869dfa852
2023-05-29 05:56:31 +00:00
Remi NGUYEN VAN
85ff5b1323 Only send to downstream ifaces for null network
When sendMulticastPacket or sendUnicastPacket is called with the null
network, only send the packets to interfaces indexed with null, instead
of all interfaces.

When using MdnsMultinetworkSocketClient sending packets on the null
network means sending on tethered downstream interfaces. When
MdnsSocketClient is used (not used in the Android tree), sending on the
null network sends on all interfaces as MdnsSocketClient does not
support specific networks. This is clarified by explicitly throwing
when a non-null Network is attempted to be used with MdnsSocketClient
(but MdnsSocketClient is only used for tests in the Android tree).

Bug: 283708537
Test: atest
(cherry picked from https://android-review.googlesource.com/q/commit:87c374a37ac8698a98d0c35a3196922c69549cc7)
Merged-In: Ia0186bf8aa2e0fc5878d6071fd23599df8488616
Change-Id: Ia0186bf8aa2e0fc5878d6071fd23599df8488616
2023-05-29 05:56:27 +00:00
Remi NGUYEN VAN
e82a699fc7 Use the ServiceTypeClient network for queries
Instead of the network specified in the MdnsSearchOptions, which is
often null to request searching on all networks, use the
MdnsServiceTypeClient Network to build the queries.

When MdnsSearchOptions.network is null, one MdnsServiceTypeClient is
created for each mDNS-compatible Network. Each MdnsServiceTypeClient
schedules queries with a Network selector. If the Network selector is
null, each MdnsServiceTypeClient will post its queries to all networks.
Instead, it should be the Network of the MdnsServiceTypeClient.

There is one remaining problem when a tethered interface is up: in that
case, there will be one MdnsServiceTypeClient for tethered interfaces
with a null network, which will still broadcast its queries to all
networks. This should be addressed in a follow-up by having
MdnsMultinetworkSocketClient only send queries to interfaces that have a
null network, when the network selector is null (and not all
interfaces).

Bug: 283708537
Test: atest
(cherry picked from https://android-review.googlesource.com/q/commit:404c1bf7877316df27389aa8a1ac855a25a86c20)
Merged-In: If571d7a59c5e55d809eeb1f3d1c4b58684612cdd
Change-Id: If571d7a59c5e55d809eeb1f3d1c4b58684612cdd
2023-05-29 05:56:24 +00:00
Remi NGUYEN VAN
7fd1e98040 Add test for subtype discovery/advertising
Check that advertised subtypes can be found by matching discoveries and
discoveries for the base type, and that discoveries for different
subtypes do not find the service.

Bug: 266167702
Test: atest
(cherry picked from https://android-review.googlesource.com/q/commit:eae8529fc6542691ba2f0c1262f3ab8732e4434b)
Merged-In: I0a8249cca22c1d30baad12bb4e8351a65ce87cb1
Change-Id: I0a8249cca22c1d30baad12bb4e8351a65ce87cb1
2023-05-29 05:56:21 +00:00
Paul Hu
fbd8c14b87 Ensure MdnsDiscoveryManager calls to ServiceTypeClients on looper thread
ServiceTypeClients will store/access services on MdnsServiceCache
in subsequent changes. And MdnsServiceCache can be accessed from
looper thread only. So ensure MdnsDiscoveryManager calls to
ServiceTypeClients on the looper thread.

Bug: 265787401
Test: atest FrameworksNetTests
(cherry picked from https://android-review.googlesource.com/q/commit:bd4140ea913ad031057ff37bea8c2556b4970463)
Merged-In: I05e73140da58c029b49057bb0ccfdb8ed7818dfc
Change-Id: I05e73140da58c029b49057bb0ccfdb8ed7818dfc
2023-05-29 05:56:08 +00:00
Remi NGUYEN VAN
109026cffb Merge "Do not process null network packets on all clients" am: f4cf2707e7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2602192

Change-Id: I3e94b684cded40e8c64497ed6d18e204ec3f0087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-29 04:38:01 +00:00
Remi NGUYEN VAN
0aece1e60a Merge "Only send to downstream ifaces for null network" am: 5a1c614e42
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2598346

Change-Id: I30cd4a5fc97652c383dd0deea22a99f35f0f4db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-29 04:37:49 +00:00
Remi NGUYEN VAN
d9dc6b8f35 Merge "Use the ServiceTypeClient network for queries" am: 401ab44c36
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2598345

Change-Id: I4867b6ecd024f4f5d466b0372a44d89292f7d934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-29 04:37:37 +00:00
Remi NGUYEN VAN
f4cf2707e7 Merge "Do not process null network packets on all clients" 2023-05-29 03:56:26 +00:00
Remi NGUYEN VAN
5a1c614e42 Merge "Only send to downstream ifaces for null network" 2023-05-29 03:56:20 +00:00
Remi NGUYEN VAN
401ab44c36 Merge "Use the ServiceTypeClient network for queries" 2023-05-29 03:56:12 +00:00
Chalard Jean
a8aeef7ae8 Test for not logging meaningless caps changes
Test: this
Bug: 238696406
(cherry picked from https://android-review.googlesource.com/q/commit:16e41d130c99edcd222277381af96f82685579bb)
Merged-In: Ife6500daae58b7f85a7f4c76cd89ce91def5e78c
Change-Id: Ife6500daae58b7f85a7f4c76cd89ce91def5e78c
2023-05-25 02:12:49 +00:00
Remi NGUYEN VAN
0ba206cbd1 Do not process null network packets on all clients
Packets received from the "null" networks are packets received from
tethering downstream interfaces. They should not be processed by all
MdnsServiceTypeClients; instead they should be processed by
the MdnsServiceTypeClient for the null network.

Bug: 283708537
Test: atest
Change-Id: Ifef59eca7a24bdfe3650067445d2565869dfa852
2023-05-24 16:37:13 +09:00
Remi NGUYEN VAN
87c374a37a Only send to downstream ifaces for null network
When sendMulticastPacket or sendUnicastPacket is called with the null
network, only send the packets to interfaces indexed with null, instead
of all interfaces.

When using MdnsMultinetworkSocketClient sending packets on the null
network means sending on tethered downstream interfaces. When
MdnsSocketClient is used (not used in the Android tree), sending on the
null network sends on all interfaces as MdnsSocketClient does not
support specific networks. This is clarified by explicitly throwing
when a non-null Network is attempted to be used with MdnsSocketClient
(but MdnsSocketClient is only used for tests in the Android tree).

Bug: 283708537
Test: atest
Change-Id: Ia0186bf8aa2e0fc5878d6071fd23599df8488616
2023-05-24 14:30:14 +09:00
Chiachang Wang
0440b5ff1c Merge "Cleanup VpnTest for unused methods/annotations" am: 3fabc1b0e0 am: 8876c19670 am: ac24d09b2d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2570372

Change-Id: I3a41067be79c279bfa39648aed94b626db282fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:55:39 +00:00
Chiachang Wang
8611aaf1be Merge "Test for not logging meaningless caps changes" am: b1f3dd9dd1 am: b767eb1125 am: 0aeade1f9c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2567413

Change-Id: Idc6778669c4ee253be370fed49425200e4e1c3a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:54:38 +00:00
Chiachang Wang
9da48c4f6c Merge "Cleanup VpnTest for unused methods/annotations" am: 3fabc1b0e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2570372

Change-Id: Iaf35a7e053d1122f5fc4fda0fc29929121789b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 02:30:41 +00:00
Chiachang Wang
f697173bd9 Merge "Test for not logging meaningless caps changes" am: b1f3dd9dd1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2567413

Change-Id: Icc48407ecc4689a55322d60274075b0e211890ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 02:30:29 +00:00
Chiachang Wang
3fabc1b0e0 Merge "Cleanup VpnTest for unused methods/annotations" 2023-05-24 01:41:01 +00:00
Chiachang Wang
b1f3dd9dd1 Merge "Test for not logging meaningless caps changes" 2023-05-24 01:40:34 +00:00
TreeHugger Robot
b7771e602a Merge "Skip all of NetworkAgentTest in instant mode." into udc-dev am: 7201544850
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23386856

Change-Id: I2a3632184a503071d605183d9e8db99e397dcf3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 10:26:04 +00:00
Chalard Jean
74732ba43d Cleanup VpnTest for unused methods/annotations
• Remove unused private methods
• Build files have this test in FrameworksNetTests, which
  by TEST_MAPPING is not run on T and below. It is not in
  the targets that do run on T and below like
  ConnectivityCoverageTest.

Test: VpnTest
Change-Id: I198e5b3571e34e41611f71d351501d3f98f78caa
2023-05-23 18:30:05 +09:00
Chalard Jean
16e41d130c Test for not logging meaningless caps changes
Test: this
Change-Id: Ife6500daae58b7f85a7f4c76cd89ce91def5e78c
2023-05-23 18:30:04 +09:00