From 03a51d567486f94a74b0209d7fb65018358ffbd3 Mon Sep 17 00:00:00 2001 From: Paul Hu Date: Fri, 13 Jan 2023 14:17:04 +0800 Subject: [PATCH] Move mDNS code to service-connectivity-t Instead of using a separate service-mdns library, move the code to service-connectivity-t. service-connectivity-t is chosen because it has access to hidden API of classes that were made updatable in T, such as NsdServiceInfo and NsdManager. mdns code can be there as it is only loaded on T+. Bug: 241738458 Test: atest Change-Id: I7eb6c9ab8bf0e0a614ea2994c6ed80a1a780241f --- service-t/Android.bp | 1 + .../server}/mdns/ConnectivityMonitor.java | 0 ...ctivityMonitorWithConnectivityManager.java | 0 .../mdns/EnqueueMdnsQueryCallable.java | 0 .../server}/mdns/ExecutorProvider.java | 0 .../android/server}/mdns/MdnsAdvertiser.java | 0 .../android/server}/mdns/MdnsAnnouncer.java | 0 .../android/server}/mdns/MdnsAnyRecord.java | 0 .../com/android/server}/mdns/MdnsConfigs.java | 0 .../android/server}/mdns/MdnsConstants.java | 0 .../server}/mdns/MdnsDiscoveryManager.java | 0 .../server}/mdns/MdnsInetAddressRecord.java | 0 .../server}/mdns/MdnsInterfaceAdvertiser.java | 0 .../server}/mdns/MdnsInterfaceSocket.java | 0 .../mdns/MdnsMultinetworkSocketClient.java | 0 .../android/server}/mdns/MdnsNsecRecord.java | 0 .../com/android/server}/mdns/MdnsPacket.java | 0 .../server}/mdns/MdnsPacketReader.java | 0 .../server}/mdns/MdnsPacketRepeater.java | 0 .../server}/mdns/MdnsPacketWriter.java | 0 .../server}/mdns/MdnsPointerRecord.java | 0 .../com/android/server}/mdns/MdnsProber.java | 0 .../com/android/server}/mdns/MdnsRecord.java | 0 .../server}/mdns/MdnsRecordRepository.java | 0 .../android/server}/mdns/MdnsReplySender.java | 0 .../android/server}/mdns/MdnsResponse.java | 0 .../server}/mdns/MdnsResponseDecoder.java | 0 .../server}/mdns/MdnsResponseErrorCode.java | 0 .../server}/mdns/MdnsSearchOptions.java | 0 .../mdns/MdnsServiceBrowserListener.java | 0 .../android/server}/mdns/MdnsServiceInfo.java | 0 .../server}/mdns/MdnsServiceRecord.java | 0 .../server}/mdns/MdnsServiceTypeClient.java | 0 .../com/android/server}/mdns/MdnsSocket.java | 0 .../server}/mdns/MdnsSocketClient.java | 0 .../server}/mdns/MdnsSocketClientBase.java | 0 .../server}/mdns/MdnsSocketProvider.java | 0 .../android/server}/mdns/MdnsTextRecord.java | 0 .../MulticastNetworkInterfaceProvider.java | 0 .../server}/mdns/MulticastPacketReader.java | 0 .../server}/mdns/NameConflictException.java | 0 .../server}/mdns/NetworkInterfaceWrapper.java | 0 .../android/server}/mdns/util/MdnsLogger.java | 0 service/Android.bp | 21 ------------------- tests/unit/Android.bp | 3 --- .../mdns/MdnsSocketProviderTest.java | 9 ++++++++ 46 files changed, 10 insertions(+), 24 deletions(-) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/ConnectivityMonitor.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/ConnectivityMonitorWithConnectivityManager.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/EnqueueMdnsQueryCallable.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/ExecutorProvider.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsAdvertiser.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsAnnouncer.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsAnyRecord.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsConfigs.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsConstants.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsDiscoveryManager.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsInetAddressRecord.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsInterfaceAdvertiser.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsInterfaceSocket.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsMultinetworkSocketClient.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsNsecRecord.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsPacket.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsPacketReader.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsPacketRepeater.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsPacketWriter.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsPointerRecord.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsProber.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsRecord.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsRecordRepository.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsReplySender.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsResponse.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsResponseDecoder.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsResponseErrorCode.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsSearchOptions.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsServiceBrowserListener.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsServiceInfo.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsServiceRecord.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsServiceTypeClient.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsSocket.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsSocketClient.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsSocketClientBase.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsSocketProvider.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MdnsTextRecord.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MulticastNetworkInterfaceProvider.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/MulticastPacketReader.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/NameConflictException.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/NetworkInterfaceWrapper.java (100%) rename {service/mdns/com/android/server/connectivity => service-t/src/com/android/server}/mdns/util/MdnsLogger.java (100%) diff --git a/service-t/Android.bp b/service-t/Android.bp index d876166b5b..5bf29731ed 100644 --- a/service-t/Android.bp +++ b/service-t/Android.bp @@ -52,6 +52,7 @@ java_library { "framework-connectivity-t-pre-jarjar", // TODO: use framework-tethering-pre-jarjar when it is separated from framework-tethering "framework-tethering.impl", + "framework-wifi", "service-connectivity-pre-jarjar", "service-nearby-pre-jarjar", "ServiceConnectivityResources", diff --git a/service/mdns/com/android/server/connectivity/mdns/ConnectivityMonitor.java b/service-t/src/com/android/server/mdns/ConnectivityMonitor.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/ConnectivityMonitor.java rename to service-t/src/com/android/server/mdns/ConnectivityMonitor.java diff --git a/service/mdns/com/android/server/connectivity/mdns/ConnectivityMonitorWithConnectivityManager.java b/service-t/src/com/android/server/mdns/ConnectivityMonitorWithConnectivityManager.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/ConnectivityMonitorWithConnectivityManager.java rename to service-t/src/com/android/server/mdns/ConnectivityMonitorWithConnectivityManager.java diff --git a/service/mdns/com/android/server/connectivity/mdns/EnqueueMdnsQueryCallable.java b/service-t/src/com/android/server/mdns/EnqueueMdnsQueryCallable.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/EnqueueMdnsQueryCallable.java rename to service-t/src/com/android/server/mdns/EnqueueMdnsQueryCallable.java diff --git a/service/mdns/com/android/server/connectivity/mdns/ExecutorProvider.java b/service-t/src/com/android/server/mdns/ExecutorProvider.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/ExecutorProvider.java rename to service-t/src/com/android/server/mdns/ExecutorProvider.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsAdvertiser.java b/service-t/src/com/android/server/mdns/MdnsAdvertiser.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsAdvertiser.java rename to service-t/src/com/android/server/mdns/MdnsAdvertiser.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsAnnouncer.java b/service-t/src/com/android/server/mdns/MdnsAnnouncer.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsAnnouncer.java rename to service-t/src/com/android/server/mdns/MdnsAnnouncer.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsAnyRecord.java b/service-t/src/com/android/server/mdns/MdnsAnyRecord.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsAnyRecord.java rename to service-t/src/com/android/server/mdns/MdnsAnyRecord.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsConfigs.java b/service-t/src/com/android/server/mdns/MdnsConfigs.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsConfigs.java rename to service-t/src/com/android/server/mdns/MdnsConfigs.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsConstants.java b/service-t/src/com/android/server/mdns/MdnsConstants.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsConstants.java rename to service-t/src/com/android/server/mdns/MdnsConstants.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java b/service-t/src/com/android/server/mdns/MdnsDiscoveryManager.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java rename to service-t/src/com/android/server/mdns/MdnsDiscoveryManager.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsInetAddressRecord.java b/service-t/src/com/android/server/mdns/MdnsInetAddressRecord.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsInetAddressRecord.java rename to service-t/src/com/android/server/mdns/MdnsInetAddressRecord.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java b/service-t/src/com/android/server/mdns/MdnsInterfaceAdvertiser.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsInterfaceAdvertiser.java rename to service-t/src/com/android/server/mdns/MdnsInterfaceAdvertiser.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsInterfaceSocket.java b/service-t/src/com/android/server/mdns/MdnsInterfaceSocket.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsInterfaceSocket.java rename to service-t/src/com/android/server/mdns/MdnsInterfaceSocket.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsMultinetworkSocketClient.java b/service-t/src/com/android/server/mdns/MdnsMultinetworkSocketClient.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsMultinetworkSocketClient.java rename to service-t/src/com/android/server/mdns/MdnsMultinetworkSocketClient.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsNsecRecord.java b/service-t/src/com/android/server/mdns/MdnsNsecRecord.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsNsecRecord.java rename to service-t/src/com/android/server/mdns/MdnsNsecRecord.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsPacket.java b/service-t/src/com/android/server/mdns/MdnsPacket.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsPacket.java rename to service-t/src/com/android/server/mdns/MdnsPacket.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsPacketReader.java b/service-t/src/com/android/server/mdns/MdnsPacketReader.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsPacketReader.java rename to service-t/src/com/android/server/mdns/MdnsPacketReader.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsPacketRepeater.java b/service-t/src/com/android/server/mdns/MdnsPacketRepeater.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsPacketRepeater.java rename to service-t/src/com/android/server/mdns/MdnsPacketRepeater.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsPacketWriter.java b/service-t/src/com/android/server/mdns/MdnsPacketWriter.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsPacketWriter.java rename to service-t/src/com/android/server/mdns/MdnsPacketWriter.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsPointerRecord.java b/service-t/src/com/android/server/mdns/MdnsPointerRecord.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsPointerRecord.java rename to service-t/src/com/android/server/mdns/MdnsPointerRecord.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsProber.java b/service-t/src/com/android/server/mdns/MdnsProber.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsProber.java rename to service-t/src/com/android/server/mdns/MdnsProber.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsRecord.java b/service-t/src/com/android/server/mdns/MdnsRecord.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsRecord.java rename to service-t/src/com/android/server/mdns/MdnsRecord.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsRecordRepository.java b/service-t/src/com/android/server/mdns/MdnsRecordRepository.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsRecordRepository.java rename to service-t/src/com/android/server/mdns/MdnsRecordRepository.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsReplySender.java b/service-t/src/com/android/server/mdns/MdnsReplySender.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsReplySender.java rename to service-t/src/com/android/server/mdns/MdnsReplySender.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsResponse.java b/service-t/src/com/android/server/mdns/MdnsResponse.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsResponse.java rename to service-t/src/com/android/server/mdns/MdnsResponse.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsResponseDecoder.java b/service-t/src/com/android/server/mdns/MdnsResponseDecoder.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsResponseDecoder.java rename to service-t/src/com/android/server/mdns/MdnsResponseDecoder.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsResponseErrorCode.java b/service-t/src/com/android/server/mdns/MdnsResponseErrorCode.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsResponseErrorCode.java rename to service-t/src/com/android/server/mdns/MdnsResponseErrorCode.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsSearchOptions.java b/service-t/src/com/android/server/mdns/MdnsSearchOptions.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsSearchOptions.java rename to service-t/src/com/android/server/mdns/MdnsSearchOptions.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsServiceBrowserListener.java b/service-t/src/com/android/server/mdns/MdnsServiceBrowserListener.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsServiceBrowserListener.java rename to service-t/src/com/android/server/mdns/MdnsServiceBrowserListener.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsServiceInfo.java b/service-t/src/com/android/server/mdns/MdnsServiceInfo.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsServiceInfo.java rename to service-t/src/com/android/server/mdns/MdnsServiceInfo.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsServiceRecord.java b/service-t/src/com/android/server/mdns/MdnsServiceRecord.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsServiceRecord.java rename to service-t/src/com/android/server/mdns/MdnsServiceRecord.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java b/service-t/src/com/android/server/mdns/MdnsServiceTypeClient.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java rename to service-t/src/com/android/server/mdns/MdnsServiceTypeClient.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsSocket.java b/service-t/src/com/android/server/mdns/MdnsSocket.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsSocket.java rename to service-t/src/com/android/server/mdns/MdnsSocket.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsSocketClient.java b/service-t/src/com/android/server/mdns/MdnsSocketClient.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsSocketClient.java rename to service-t/src/com/android/server/mdns/MdnsSocketClient.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsSocketClientBase.java b/service-t/src/com/android/server/mdns/MdnsSocketClientBase.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsSocketClientBase.java rename to service-t/src/com/android/server/mdns/MdnsSocketClientBase.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsSocketProvider.java b/service-t/src/com/android/server/mdns/MdnsSocketProvider.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsSocketProvider.java rename to service-t/src/com/android/server/mdns/MdnsSocketProvider.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MdnsTextRecord.java b/service-t/src/com/android/server/mdns/MdnsTextRecord.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MdnsTextRecord.java rename to service-t/src/com/android/server/mdns/MdnsTextRecord.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MulticastNetworkInterfaceProvider.java b/service-t/src/com/android/server/mdns/MulticastNetworkInterfaceProvider.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MulticastNetworkInterfaceProvider.java rename to service-t/src/com/android/server/mdns/MulticastNetworkInterfaceProvider.java diff --git a/service/mdns/com/android/server/connectivity/mdns/MulticastPacketReader.java b/service-t/src/com/android/server/mdns/MulticastPacketReader.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/MulticastPacketReader.java rename to service-t/src/com/android/server/mdns/MulticastPacketReader.java diff --git a/service/mdns/com/android/server/connectivity/mdns/NameConflictException.java b/service-t/src/com/android/server/mdns/NameConflictException.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/NameConflictException.java rename to service-t/src/com/android/server/mdns/NameConflictException.java diff --git a/service/mdns/com/android/server/connectivity/mdns/NetworkInterfaceWrapper.java b/service-t/src/com/android/server/mdns/NetworkInterfaceWrapper.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/NetworkInterfaceWrapper.java rename to service-t/src/com/android/server/mdns/NetworkInterfaceWrapper.java diff --git a/service/mdns/com/android/server/connectivity/mdns/util/MdnsLogger.java b/service-t/src/com/android/server/mdns/util/MdnsLogger.java similarity index 100% rename from service/mdns/com/android/server/connectivity/mdns/util/MdnsLogger.java rename to service-t/src/com/android/server/mdns/util/MdnsLogger.java diff --git a/service/Android.bp b/service/Android.bp index 8fa64361a9..c8d2fdd58d 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -195,27 +195,6 @@ java_library { ], } -// TODO: Remove this temporary library and put code into module when test coverage is enough. -java_library { - name: "service-mdns", - sdk_version: "system_server_current", - min_sdk_version: "30", - srcs: [ - "mdns/**/*.java", - ], - libs: [ - "framework-annotations-lib", - "framework-connectivity-pre-jarjar", - "framework-connectivity-t-pre-jarjar", - "framework-tethering", - "framework-wifi", - "service-connectivity-pre-jarjar", - ], - visibility: [ - "//packages/modules/Connectivity/tests:__subpackages__", - ], -} - java_library { name: "service-connectivity-protos", sdk_version: "system_current", diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 209430a232..e0de246638 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -73,8 +73,6 @@ filegroup { "java/com/android/server/connectivity/NetdEventListenerServiceTest.java", "java/com/android/server/connectivity/VpnTest.java", "java/com/android/server/net/ipmemorystore/*.java", - "java/com/android/server/connectivity/mdns/**/*.java", - "java/com/android/server/connectivity/mdns/**/*.kt", ] } @@ -149,7 +147,6 @@ android_test { static_libs: [ "services.core", "services.net", - "service-mdns", ], jni_libs: [ "libandroid_net_connectivity_com_android_net_module_util_jni", diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketProviderTest.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketProviderTest.java index 07bbbb56a0..635b296957 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketProviderTest.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketProviderTest.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -89,7 +90,15 @@ public class MdnsSocketProviderTest { public void setUp() throws IOException { MockitoAnnotations.initMocks(this); mockService(mContext, ConnectivityManager.class, Context.CONNECTIVITY_SERVICE, mCm); + if (mContext.getSystemService(ConnectivityManager.class) == null) { + // Test is using mockito-extended + doCallRealMethod().when(mContext).getSystemService(ConnectivityManager.class); + } mockService(mContext, TetheringManager.class, Context.TETHERING_SERVICE, mTm); + if (mContext.getSystemService(TetheringManager.class) == null) { + // Test is using mockito-extended + doCallRealMethod().when(mContext).getSystemService(TetheringManager.class); + } doReturn(true).when(mDeps).canScanOnInterface(any()); doReturn(mTestNetworkIfaceWrapper).when(mDeps).getNetworkInterfaceByName(TEST_IFACE_NAME); doReturn(mLocalOnlyIfaceWrapper).when(mDeps)