| commit | bff1cf7132aa783a19d7f4c61210cea4aa8f9890 | [log] [tgz] |
|---|---|---|
| author | Yuyang Huang <yuyanghuang@google.com> | Mon Jun 12 14:50:06 2023 +0900 |
| committer | Yuyang Huang <yuyanghuang@google.com> | Mon Jun 12 14:50:06 2023 +0900 |
| tree | 08e22d99ca6182d9472d541a4d7db408407d058e | |
| parent | c17aee3117cb2644b6c998ad65976b0b48b69c54 [diff] |
Importing the following changes from gmscore * Only shutdown the executor when it is not shutdown * Added logging to trace mDNS service type client registrations and response handling. Bug: 285508143 Test: atest CtsNetTest FrameworksNetTests Change-Id: I9350941e63b0c6917f69aa588aaa0f234f93aa08
diff --git a/service-t/src/com/android/server/connectivity/mdns/ExecutorProvider.java b/service-t/src/com/android/server/connectivity/mdns/ExecutorProvider.java index 72b65e0..0eebc61 100644 --- a/service-t/src/com/android/server/connectivity/mdns/ExecutorProvider.java +++ b/service-t/src/com/android/server/connectivity/mdns/ExecutorProvider.java
@@ -42,6 +42,9 @@ /** Shuts down all the created {@link ScheduledExecutorService} instances. */ public void shutdownAll() { for (ScheduledExecutorService executor : serviceTypeClientSchedulerExecutors) { + if (executor.isShutdown()) { + continue; + } executor.shutdownNow(); } }
diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java b/service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java index 39fceb9..92a26f1 100644 --- a/service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java +++ b/service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java
@@ -238,6 +238,7 @@ } if (perNetworkServiceTypeClients.isEmpty()) { // No discovery request. Stops the socket client. + sharedLog.i("All service type listeners unregistered; stopping discovery"); socketClient.stopDiscovery(); } }
diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java b/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java index 49a376c..68b03d3 100644 --- a/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java +++ b/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java
@@ -332,6 +332,7 @@ private void onResponseModified(@NonNull MdnsResponse response) { final String serviceInstanceName = response.getServiceInstanceName(); + sharedLog.i("Handling response from service: " + serviceInstanceName); final MdnsResponse currentResponse = instanceNameToResponse.get(serviceInstanceName);