Merge "Importing the following changes from gmscore"

service-t/src/com/android/server/connectivity/mdns/ExecutorProvider.java

@@ -42,6 +42,9 @@ public class ExecutorProvider {
     /** Shuts down all the created {@link ScheduledExecutorService} instances. */
     public void shutdownAll() {
         for (ScheduledExecutorService executor : serviceTypeClientSchedulerExecutors) {
+            if (executor.isShutdown()) {
+                continue;
+            }
             executor.shutdownNow();
         }
     }

service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java

@@ -238,6 +238,7 @@ public class MdnsDiscoveryManager implements MdnsSocketClientBase.Callback {
         }
         if (perNetworkServiceTypeClients.isEmpty()) {
             // No discovery request. Stops the socket client.
+            sharedLog.i("All service type listeners unregistered; stopping discovery");
             socketClient.stopDiscovery();
         }
     }

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

@@ -332,6 +332,7 @@ public class MdnsServiceTypeClient {
 
     private void onResponseModified(@NonNull MdnsResponse response) {
         final String serviceInstanceName = response.getServiceInstanceName();
+        sharedLog.i("Handling response from service: " + serviceInstanceName);
         final MdnsResponse currentResponse =
                 instanceNameToResponse.get(serviceInstanceName);