Merge "Move net unit tests to packages/Connectivity" into sc-dev am: 5f7ffd4136

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14500983 Change-Id: Id09180982b29447e65bbf5ff4ebffa1f3c6efc55
2021-05-13 09:27:35 +00:00
parent e15ca5b2ab 5f7ffd4136
commit d502cc832d
147 changed files with 1 additions and 1 deletions
--- a/packages/Connectivity/framework/Android.bp
+++ b/packages/Connectivity/framework/Android.bp
@@ -102,7 +102,7 @@ java_sdk_library {
        // Tests using hidden APIs
        "//cts/tests/netlegacy22.api",
        "//external/sl4a:__subpackages__",
-        "//frameworks/base/tests/net:__subpackages__",
+        "//frameworks/base/packages/Connectivity/tests:__subpackages__",
        "//frameworks/libs/net/common/testutils",
        "//frameworks/libs/net/common/tests:__subpackages__",
        "//frameworks/opt/telephony/tests/telephonytests",
--- a/packages/Connectivity/tests/OWNERS
+++ b/packages/Connectivity/tests/OWNERS
--- a/packages/Connectivity/tests/TEST_MAPPING
+++ b/packages/Connectivity/tests/TEST_MAPPING
--- a/packages/Connectivity/tests/common/Android.bp
+++ b/packages/Connectivity/tests/common/Android.bp
--- a/packages/Connectivity/tests/common/java/ParseExceptionTest.kt
+++ b/packages/Connectivity/tests/common/java/ParseExceptionTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/CaptivePortalDataTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/CaptivePortalDataTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/CaptivePortalTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/CaptivePortalTest.java
--- a/packages/Connectivity/tests/common/java/android/net/DependenciesTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/DependenciesTest.java
--- a/packages/Connectivity/tests/common/java/android/net/DhcpInfoTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/DhcpInfoTest.java
--- a/packages/Connectivity/tests/common/java/android/net/IpPrefixTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/IpPrefixTest.java
--- a/packages/Connectivity/tests/common/java/android/net/KeepalivePacketDataTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/KeepalivePacketDataTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/LinkAddressTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/LinkAddressTest.java
--- a/packages/Connectivity/tests/common/java/android/net/LinkPropertiesTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/LinkPropertiesTest.java
--- a/packages/Connectivity/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/NattKeepalivePacketDataTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/NattKeepalivePacketDataTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/NetworkAgentConfigTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/NetworkAgentConfigTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java
--- a/packages/Connectivity/tests/common/java/android/net/NetworkProviderTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/NetworkProviderTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/NetworkSpecifierTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/NetworkSpecifierTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/NetworkStackTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/NetworkStackTest.java
--- a/packages/Connectivity/tests/common/java/android/net/NetworkStateSnapshotTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/NetworkStateSnapshotTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/NetworkTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/NetworkTest.java
--- a/packages/Connectivity/tests/common/java/android/net/OemNetworkPreferencesTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/OemNetworkPreferencesTest.java
--- a/packages/Connectivity/tests/common/java/android/net/RouteInfoTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/RouteInfoTest.java
--- a/packages/Connectivity/tests/common/java/android/net/StaticIpConfigurationTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/StaticIpConfigurationTest.java
--- a/packages/Connectivity/tests/common/java/android/net/TcpKeepalivePacketDataTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/TcpKeepalivePacketDataTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/UidRangeTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/UidRangeTest.java
--- a/packages/Connectivity/tests/common/java/android/net/UnderlyingNetworkInfoTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/UnderlyingNetworkInfoTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/apf/ApfCapabilitiesTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/apf/ApfCapabilitiesTest.java
--- a/packages/Connectivity/tests/common/java/android/net/metrics/ApfProgramEventTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/ApfProgramEventTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/metrics/ApfStatsTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/ApfStatsTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/metrics/DhcpClientEventTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/DhcpClientEventTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/metrics/DhcpErrorEventTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/DhcpErrorEventTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/metrics/IpConnectivityLogTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/IpConnectivityLogTest.java
--- a/packages/Connectivity/tests/common/java/android/net/metrics/IpManagerEventTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/IpManagerEventTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/metrics/IpReachabilityEventTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/IpReachabilityEventTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/metrics/NetworkEventTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/NetworkEventTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/metrics/RaEventTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/RaEventTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/metrics/ValidationProbeEventTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/metrics/ValidationProbeEventTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/netstats/NetworkStatsApiTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/netstats/NetworkStatsApiTest.kt
--- a/packages/Connectivity/tests/common/java/android/net/util/SocketUtilsTest.kt
+++ b/packages/Connectivity/tests/common/java/android/net/util/SocketUtilsTest.kt
--- a/packages/Connectivity/tests/deflake/Android.bp
+++ b/packages/Connectivity/tests/deflake/Android.bp
--- a/packages/Connectivity/tests/deflake/src/com/android/server/net/FrameworksNetDeflakeTest.kt
+++ b/packages/Connectivity/tests/deflake/src/com/android/server/net/FrameworksNetDeflakeTest.kt
--- a/packages/Connectivity/tests/integration/Android.bp
+++ b/packages/Connectivity/tests/integration/Android.bp
--- a/packages/Connectivity/tests/integration/AndroidManifest.xml
+++ b/packages/Connectivity/tests/integration/AndroidManifest.xml
--- a/packages/Connectivity/tests/integration/res/values/config.xml
+++ b/packages/Connectivity/tests/integration/res/values/config.xml
--- a/packages/Connectivity/tests/integration/src/android/net/TestNetworkStackClient.kt
+++ b/packages/Connectivity/tests/integration/src/android/net/TestNetworkStackClient.kt
--- a/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt
+++ b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt
--- a/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/HttpResponse.aidl
+++ b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/HttpResponse.aidl
--- a/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/HttpResponse.kt
+++ b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/HttpResponse.kt
--- a/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/INetworkStackInstrumentation.aidl
+++ b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/INetworkStackInstrumentation.aidl
--- a/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt
+++ b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt
--- a/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt
+++ b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt
--- a/packages/Connectivity/tests/integration/util/com/android/server/ConnectivityServiceTestUtils.kt
+++ b/packages/Connectivity/tests/integration/util/com/android/server/ConnectivityServiceTestUtils.kt
--- a/packages/Connectivity/tests/integration/util/com/android/server/NetworkAgentWrapper.java
+++ b/packages/Connectivity/tests/integration/util/com/android/server/NetworkAgentWrapper.java
--- a/packages/Connectivity/tests/integration/util/com/android/server/TestNetIdManager.kt
+++ b/packages/Connectivity/tests/integration/util/com/android/server/TestNetIdManager.kt
--- a/packages/Connectivity/tests/smoketest/Android.bp
+++ b/packages/Connectivity/tests/smoketest/Android.bp
--- a/packages/Connectivity/tests/smoketest/AndroidManifest.xml
+++ b/packages/Connectivity/tests/smoketest/AndroidManifest.xml
--- a/packages/Connectivity/tests/smoketest/AndroidTest.xml
+++ b/packages/Connectivity/tests/smoketest/AndroidTest.xml
--- a/packages/Connectivity/tests/smoketest/java/SmokeTest.java
+++ b/packages/Connectivity/tests/smoketest/java/SmokeTest.java
--- a/packages/Connectivity/tests/unit/Android.bp
+++ b/packages/Connectivity/tests/unit/Android.bp
--- a/packages/Connectivity/tests/unit/AndroidManifest.xml
+++ b/packages/Connectivity/tests/unit/AndroidManifest.xml
--- a/packages/Connectivity/tests/unit/AndroidTest.xml
+++ b/packages/Connectivity/tests/unit/AndroidTest.xml
--- a/packages/Connectivity/tests/unit/jarjar-rules.txt
+++ b/packages/Connectivity/tests/unit/jarjar-rules.txt
--- a/packages/Connectivity/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java
+++ b/packages/Connectivity/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/ConnectivityDiagnosticsManagerTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/ConnectivityDiagnosticsManagerTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/ConnectivityManagerTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/ConnectivityManagerTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/Ikev2VpnProfileTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/Ikev2VpnProfileTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/IpMemoryStoreTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/IpMemoryStoreTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/IpSecAlgorithmTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/IpSecAlgorithmTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/IpSecConfigTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/IpSecConfigTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/IpSecManagerTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/IpSecManagerTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/IpSecTransformTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/IpSecTransformTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/MacAddressTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/MacAddressTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/NetworkIdentityTest.kt
+++ b/packages/Connectivity/tests/unit/java/android/net/NetworkIdentityTest.kt
--- a/packages/Connectivity/tests/unit/java/android/net/NetworkStatsHistoryTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/NetworkStatsHistoryTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/NetworkStatsTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/NetworkStatsTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/NetworkTemplateTest.kt
+++ b/packages/Connectivity/tests/unit/java/android/net/NetworkTemplateTest.kt
--- a/packages/Connectivity/tests/unit/java/android/net/NetworkUtilsTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/NetworkUtilsTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/QosSocketFilterTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/QosSocketFilterTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/VpnManagerTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/VpnManagerTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/VpnTransportInfoTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/VpnTransportInfoTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java
+++ b/packages/Connectivity/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java
--- a/packages/Connectivity/tests/unit/java/android/net/nsd/NsdManagerTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/nsd/NsdManagerTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/util/DnsUtilsTest.java
+++ b/packages/Connectivity/tests/unit/java/android/net/util/DnsUtilsTest.java
--- a/packages/Connectivity/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt
+++ b/packages/Connectivity/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt
--- a/packages/Connectivity/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt
+++ b/packages/Connectivity/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt
--- a/packages/Connectivity/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java
+++ b/packages/Connectivity/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java
--- a/packages/Connectivity/tests/unit/java/com/android/internal/net/VpnProfileTest.java
+++ b/packages/Connectivity/tests/unit/java/com/android/internal/net/VpnProfileTest.java
--- a/packages/Connectivity/tests/unit/java/com/android/internal/util/BitUtilsTest.java
+++ b/packages/Connectivity/tests/unit/java/com/android/internal/util/BitUtilsTest.java
--- a/packages/Connectivity/tests/unit/java/com/android/internal/util/RingBufferTest.java
+++ b/packages/Connectivity/tests/unit/java/com/android/internal/util/RingBufferTest.java
--- a/packages/Connectivity/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/packages/Connectivity/tests/unit/java/com/android/server/ConnectivityServiceTest.java
--- a/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java
+++ b/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java
--- a/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java
+++ b/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java
--- a/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceTest.java
+++ b/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceTest.java
--- a/packages/Connectivity/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt
+++ b/packages/Connectivity/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt
--- a/packages/Connectivity/tests/unit/java/com/android/server/NetIdManagerTest.kt
+++ b/packages/Connectivity/tests/unit/java/com/android/server/NetIdManagerTest.kt
--- a/Show More
+++ b/Show More