LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use the ServiceTypeClient network for queries" am: 401ab44c36

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2598345

Change-Id: Ieca8d2ba769599ea251281027bca0a4138391bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Remi NGUYEN VAN
2023-05-29 04:35:33 +00:00
committed by Automerger Merge Worker
parent 2c10ef028b 401ab44c36
commit 88d3fcd169
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java
View File

@@ -201,7 +201,7 @@ public class MdnsServiceTypeClient {
searchOptions.getSubtypes(), searchOptions.getSubtypes(),
searchOptions.isPassiveMode(), searchOptions.isPassiveMode(),
++currentSessionId, ++currentSessionId,
searchOptions.getNetwork()); network);
if (hadReply) { if (hadReply) {
requestTaskFuture = scheduleNextRunLocked(taskConfig); requestTaskFuture = scheduleNextRunLocked(taskConfig);
} else { } else {

12
tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java
View File

@@ -952,7 +952,7 @@ public class MdnsServiceTypeClientTests {
currentThreadExecutor.getAndClearLastScheduledRunnable().run(); currentThreadExecutor.getAndClearLastScheduledRunnable().run();
// Send twice for IPv4 and IPv6 // Send twice for IPv4 and IPv6
inOrder.verify(mockSocketClient, times(2)).sendUnicastPacket(srvTxtQueryCaptor.capture(), inOrder.verify(mockSocketClient, times(2)).sendUnicastPacket(srvTxtQueryCaptor.capture(),
eq(null) /* network */); eq(mockNetwork));
final MdnsPacket srvTxtQueryPacket = MdnsPacket.parse( final MdnsPacket srvTxtQueryPacket = MdnsPacket.parse(
new MdnsPacketReader(srvTxtQueryCaptor.getValue())); new MdnsPacketReader(srvTxtQueryCaptor.getValue()));
@@ -987,7 +987,7 @@ public class MdnsServiceTypeClientTests {
ArgumentCaptor.forClass(DatagramPacket.class); ArgumentCaptor.forClass(DatagramPacket.class);
currentThreadExecutor.getAndClearLastScheduledRunnable().run(); currentThreadExecutor.getAndClearLastScheduledRunnable().run();
inOrder.verify(mockSocketClient, times(2)).sendMulticastPacket(addressQueryCaptor.capture(), inOrder.verify(mockSocketClient, times(2)).sendMulticastPacket(addressQueryCaptor.capture(),
eq(null) /* network */); eq(mockNetwork));
final MdnsPacket addressQueryPacket = MdnsPacket.parse( final MdnsPacket addressQueryPacket = MdnsPacket.parse(
new MdnsPacketReader(addressQueryCaptor.getValue())); new MdnsPacketReader(addressQueryCaptor.getValue()));
@@ -1255,17 +1255,17 @@ public class MdnsServiceTypeClientTests {
currentThreadExecutor.getAndClearLastScheduledRunnable().run(); currentThreadExecutor.getAndClearLastScheduledRunnable().run();
if (expectsUnicastResponse) { if (expectsUnicastResponse) {
verify(mockSocketClient).sendUnicastPacket( verify(mockSocketClient).sendUnicastPacket(
expectedIPv4Packets[index], null /* network */); expectedIPv4Packets[index], mockNetwork);
if (multipleSocketDiscovery) { if (multipleSocketDiscovery) {
verify(mockSocketClient).sendUnicastPacket( verify(mockSocketClient).sendUnicastPacket(
expectedIPv6Packets[index], null /* network */); expectedIPv6Packets[index], mockNetwork);
} }
} else { } else {
verify(mockSocketClient).sendMulticastPacket( verify(mockSocketClient).sendMulticastPacket(
expectedIPv4Packets[index], null /* network */); expectedIPv4Packets[index], mockNetwork);
if (multipleSocketDiscovery) { if (multipleSocketDiscovery) {
verify(mockSocketClient).sendMulticastPacket( verify(mockSocketClient).sendMulticastPacket(
expectedIPv6Packets[index], null /* network */); expectedIPv6Packets[index], mockNetwork);
} }
} }
} }