| commit | 018758595d276921f0f710272b8ef1f40251f1d1 | [log] [tgz] |
|---|---|---|
| author | Yuyang Huang <yuyanghuang@google.com> | Wed Jun 14 05:40:33 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 14 05:40:33 2023 +0000 |
| tree | f76bd2974dabbebe5d608d7e731175afdff89b60 | |
| parent | 049263eb74c4dde2fa7bd89bd069cf95b05d6bab [diff] | |
| parent | f50cbffe8fefc4ec5af19b6d3ac6701f6214e7f1 [diff] |
Merge "Revert "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 0eebc61..72b65e0 100644 --- a/service-t/src/com/android/server/connectivity/mdns/ExecutorProvider.java +++ b/service-t/src/com/android/server/connectivity/mdns/ExecutorProvider.java
@@ -42,9 +42,6 @@ /** 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 92a26f1..39fceb9 100644 --- a/service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java +++ b/service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java
@@ -238,7 +238,6 @@ } 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 68b03d3..49a376c 100644 --- a/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java +++ b/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java
@@ -332,7 +332,6 @@ private void onResponseModified(@NonNull MdnsResponse response) { final String serviceInstanceName = response.getServiceInstanceName(); - sharedLog.i("Handling response from service: " + serviceInstanceName); final MdnsResponse currentResponse = instanceNameToResponse.get(serviceInstanceName);