| commit | 049263eb74c4dde2fa7bd89bd069cf95b05d6bab | [log] [tgz] |
|---|---|---|
| author | Yuyang Huang <yuyanghuang@google.com> | Wed Jun 14 05:33:22 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 14 05:33:22 2023 +0000 |
| tree | 6b632e8da085ade8c34fa6ef12ee7134598ff819 | |
| parent | 24c29ac6a5762f9d60d9c1362c201766ba528845 [diff] | |
| parent | bff1cf7132aa783a19d7f4c61210cea4aa8f9890 [diff] |
Merge "Importing the following changes from gmscore"
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);