From a31d72986318194bfdbd7ffefa87b335239cac7e Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 15 Jan 2021 18:08:24 +0900 Subject: [PATCH] Move module sources to packages/Connectivity Files that are planned to be part of the connectivity module are grouped in packages/Connectivity, so they can be built separately and moved in one operation with their history into packages/modules/Connectivity. This places the files in the existing framework-connectivity-sources filegroup instead of the current framework-core-sources filegroup. Both are used the same way in framework-non-updatable-sources. Bug: 171540887 Test: m Change-Id: I62d9d91574ace6f5c4624035d190260c3126b91e --- .../Connectivity/framework/src}/android/net/CaptivePortal.java | 0 .../framework/src}/android/net/CaptivePortalData.aidl | 0 .../framework/src}/android/net/CaptivePortalData.java | 0 .../Connectivity/framework/src}/android/net/ConnectionInfo.aidl | 0 .../Connectivity/framework/src}/android/net/ConnectionInfo.java | 0 .../src}/android/net/ConnectivityDiagnosticsManager.aidl | 0 .../src}/android/net/ConnectivityDiagnosticsManager.java | 0 .../framework/src}/android/net/ConnectivityManager.java | 0 .../framework/src}/android/net/ConnectivityMetricsEvent.aidl | 0 .../framework/src}/android/net/ConnectivityThread.java | 0 .../Connectivity/framework/src}/android/net/DhcpInfo.aidl | 0 .../Connectivity/framework/src}/android/net/DhcpInfo.java | 0 .../Connectivity/framework/src}/android/net/DnsResolver.java | 0 .../Connectivity/framework/src}/android/net/ICaptivePortal.aidl | 0 .../src}/android/net/IConnectivityDiagnosticsCallback.aidl | 0 .../framework/src}/android/net/IConnectivityManager.aidl | 0 .../framework/src}/android/net/ISocketKeepaliveCallback.aidl | 0 .../framework/src}/android/net/ITestNetworkManager.aidl | 0 .../Connectivity/framework/src}/android/net/InetAddresses.java | 0 .../framework/src}/android/net/InterfaceConfiguration.aidl | 0 .../framework/src}/android/net/InvalidPacketException.java | 0 .../Connectivity/framework/src}/android/net/IpConfiguration.aidl | 0 .../Connectivity/framework/src}/android/net/IpConfiguration.java | 0 .../Connectivity/framework/src}/android/net/IpPrefix.aidl | 0 .../Connectivity/framework/src}/android/net/IpPrefix.java | 0 .../framework/src}/android/net/KeepalivePacketData.aidl | 0 .../framework/src}/android/net/KeepalivePacketData.java | 0 .../Connectivity/framework/src}/android/net/LinkAddress.aidl | 0 .../Connectivity/framework/src}/android/net/LinkAddress.java | 0 .../Connectivity/framework/src}/android/net/LinkProperties.aidl | 0 .../Connectivity/framework/src}/android/net/LinkProperties.java | 0 .../Connectivity/framework/src}/android/net/MacAddress.aidl | 0 .../Connectivity/framework/src}/android/net/MacAddress.java | 0 .../framework/src}/android/net/NattKeepalivePacketData.java | 0 .../framework/src}/android/net/NattSocketKeepalive.java | 0 .../Connectivity/framework/src}/android/net/Network.aidl | 0 .../Connectivity/framework/src}/android/net/Network.java | 0 .../Connectivity/framework/src}/android/net/NetworkAgent.java | 0 .../framework/src}/android/net/NetworkAgentConfig.aidl | 0 .../framework/src}/android/net/NetworkAgentConfig.java | 0 .../framework/src}/android/net/NetworkCapabilities.aidl | 0 .../framework/src}/android/net/NetworkCapabilities.java | 0 .../Connectivity/framework/src}/android/net/NetworkConfig.java | 0 .../Connectivity/framework/src}/android/net/NetworkInfo.aidl | 0 .../Connectivity/framework/src}/android/net/NetworkInfo.java | 0 .../Connectivity/framework/src}/android/net/NetworkProvider.java | 0 .../Connectivity/framework/src}/android/net/NetworkRequest.aidl | 0 .../Connectivity/framework/src}/android/net/NetworkRequest.java | 0 .../Connectivity/framework/src}/android/net/NetworkUtils.java | 0 .../Connectivity/framework/src}/android/net/PacProxySelector.java | 0 .../Connectivity/framework/src}/android/net/Proxy.java | 0 .../Connectivity/framework/src}/android/net/ProxyInfo.aidl | 0 .../Connectivity/framework/src}/android/net/ProxyInfo.java | 0 .../Connectivity/framework/src}/android/net/RouteInfo.aidl | 0 .../Connectivity/framework/src}/android/net/RouteInfo.java | 0 .../Connectivity/framework/src}/android/net/SocketKeepalive.java | 0 .../framework/src}/android/net/StaticIpConfiguration.aidl | 0 .../framework/src}/android/net/StaticIpConfiguration.java | 0 .../framework/src}/android/net/TcpKeepalivePacketData.java | 0 .../Connectivity/framework/src}/android/net/TcpRepairWindow.java | 0 .../framework/src}/android/net/TcpSocketKeepalive.java | 0 .../framework/src}/android/net/TestNetworkInterface.aidl | 0 .../framework/src}/android/net/TestNetworkInterface.java | 0 .../framework/src}/android/net/TestNetworkManager.java | 0 .../Connectivity/framework/src}/android/net/TransportInfo.java | 0 .../Connectivity/framework/src}/android/net/UidRange.aidl | 0 .../Connectivity/framework/src}/android/net/VpnManager.java | 0 .../Connectivity/framework/src}/android/net/VpnService.java | 0 .../framework/src}/android/net/apf/ApfCapabilities.aidl | 0 .../framework/src}/android/net/apf/ApfCapabilities.java | 0 .../Connectivity/framework/src}/android/net/util/DnsUtils.java | 0 .../framework/src}/android/net/util/KeepaliveUtils.java | 0 .../src}/android/net/util/MultinetworkPolicyTracker.java | 0 .../Connectivity/framework/src}/android/net/util/SocketUtils.java | 0 74 files changed, 0 insertions(+), 0 deletions(-) rename {core/java => packages/Connectivity/framework/src}/android/net/CaptivePortal.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/CaptivePortalData.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/CaptivePortalData.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ConnectionInfo.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ConnectionInfo.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ConnectivityDiagnosticsManager.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ConnectivityDiagnosticsManager.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ConnectivityManager.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ConnectivityMetricsEvent.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ConnectivityThread.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/DhcpInfo.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/DhcpInfo.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/DnsResolver.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ICaptivePortal.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/IConnectivityDiagnosticsCallback.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/IConnectivityManager.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ISocketKeepaliveCallback.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ITestNetworkManager.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/InetAddresses.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/InterfaceConfiguration.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/InvalidPacketException.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/IpConfiguration.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/IpConfiguration.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/IpPrefix.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/IpPrefix.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/KeepalivePacketData.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/KeepalivePacketData.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/LinkAddress.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/LinkAddress.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/LinkProperties.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/LinkProperties.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/MacAddress.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/MacAddress.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NattKeepalivePacketData.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NattSocketKeepalive.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/Network.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/Network.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkAgent.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkAgentConfig.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkAgentConfig.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkCapabilities.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkCapabilities.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkConfig.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkInfo.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkInfo.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkProvider.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkRequest.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkRequest.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkUtils.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/PacProxySelector.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/Proxy.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ProxyInfo.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/ProxyInfo.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/RouteInfo.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/RouteInfo.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/SocketKeepalive.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/StaticIpConfiguration.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/StaticIpConfiguration.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/TcpKeepalivePacketData.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/TcpRepairWindow.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/TcpSocketKeepalive.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/TestNetworkInterface.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/TestNetworkInterface.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/TestNetworkManager.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/TransportInfo.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/UidRange.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/VpnManager.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/VpnService.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/apf/ApfCapabilities.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/apf/ApfCapabilities.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/util/DnsUtils.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/util/KeepaliveUtils.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/util/MultinetworkPolicyTracker.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/util/SocketUtils.java (100%) diff --git a/core/java/android/net/CaptivePortal.java b/packages/Connectivity/framework/src/android/net/CaptivePortal.java similarity index 100% rename from core/java/android/net/CaptivePortal.java rename to packages/Connectivity/framework/src/android/net/CaptivePortal.java diff --git a/core/java/android/net/CaptivePortalData.aidl b/packages/Connectivity/framework/src/android/net/CaptivePortalData.aidl similarity index 100% rename from core/java/android/net/CaptivePortalData.aidl rename to packages/Connectivity/framework/src/android/net/CaptivePortalData.aidl diff --git a/core/java/android/net/CaptivePortalData.java b/packages/Connectivity/framework/src/android/net/CaptivePortalData.java similarity index 100% rename from core/java/android/net/CaptivePortalData.java rename to packages/Connectivity/framework/src/android/net/CaptivePortalData.java diff --git a/core/java/android/net/ConnectionInfo.aidl b/packages/Connectivity/framework/src/android/net/ConnectionInfo.aidl similarity index 100% rename from core/java/android/net/ConnectionInfo.aidl rename to packages/Connectivity/framework/src/android/net/ConnectionInfo.aidl diff --git a/core/java/android/net/ConnectionInfo.java b/packages/Connectivity/framework/src/android/net/ConnectionInfo.java similarity index 100% rename from core/java/android/net/ConnectionInfo.java rename to packages/Connectivity/framework/src/android/net/ConnectionInfo.java diff --git a/core/java/android/net/ConnectivityDiagnosticsManager.aidl b/packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.aidl similarity index 100% rename from core/java/android/net/ConnectivityDiagnosticsManager.aidl rename to packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.aidl diff --git a/core/java/android/net/ConnectivityDiagnosticsManager.java b/packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.java similarity index 100% rename from core/java/android/net/ConnectivityDiagnosticsManager.java rename to packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.java diff --git a/core/java/android/net/ConnectivityManager.java b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java similarity index 100% rename from core/java/android/net/ConnectivityManager.java rename to packages/Connectivity/framework/src/android/net/ConnectivityManager.java diff --git a/core/java/android/net/ConnectivityMetricsEvent.aidl b/packages/Connectivity/framework/src/android/net/ConnectivityMetricsEvent.aidl similarity index 100% rename from core/java/android/net/ConnectivityMetricsEvent.aidl rename to packages/Connectivity/framework/src/android/net/ConnectivityMetricsEvent.aidl diff --git a/core/java/android/net/ConnectivityThread.java b/packages/Connectivity/framework/src/android/net/ConnectivityThread.java similarity index 100% rename from core/java/android/net/ConnectivityThread.java rename to packages/Connectivity/framework/src/android/net/ConnectivityThread.java diff --git a/core/java/android/net/DhcpInfo.aidl b/packages/Connectivity/framework/src/android/net/DhcpInfo.aidl similarity index 100% rename from core/java/android/net/DhcpInfo.aidl rename to packages/Connectivity/framework/src/android/net/DhcpInfo.aidl diff --git a/core/java/android/net/DhcpInfo.java b/packages/Connectivity/framework/src/android/net/DhcpInfo.java similarity index 100% rename from core/java/android/net/DhcpInfo.java rename to packages/Connectivity/framework/src/android/net/DhcpInfo.java diff --git a/core/java/android/net/DnsResolver.java b/packages/Connectivity/framework/src/android/net/DnsResolver.java similarity index 100% rename from core/java/android/net/DnsResolver.java rename to packages/Connectivity/framework/src/android/net/DnsResolver.java diff --git a/core/java/android/net/ICaptivePortal.aidl b/packages/Connectivity/framework/src/android/net/ICaptivePortal.aidl similarity index 100% rename from core/java/android/net/ICaptivePortal.aidl rename to packages/Connectivity/framework/src/android/net/ICaptivePortal.aidl diff --git a/core/java/android/net/IConnectivityDiagnosticsCallback.aidl b/packages/Connectivity/framework/src/android/net/IConnectivityDiagnosticsCallback.aidl similarity index 100% rename from core/java/android/net/IConnectivityDiagnosticsCallback.aidl rename to packages/Connectivity/framework/src/android/net/IConnectivityDiagnosticsCallback.aidl diff --git a/core/java/android/net/IConnectivityManager.aidl b/packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl similarity index 100% rename from core/java/android/net/IConnectivityManager.aidl rename to packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl diff --git a/core/java/android/net/ISocketKeepaliveCallback.aidl b/packages/Connectivity/framework/src/android/net/ISocketKeepaliveCallback.aidl similarity index 100% rename from core/java/android/net/ISocketKeepaliveCallback.aidl rename to packages/Connectivity/framework/src/android/net/ISocketKeepaliveCallback.aidl diff --git a/core/java/android/net/ITestNetworkManager.aidl b/packages/Connectivity/framework/src/android/net/ITestNetworkManager.aidl similarity index 100% rename from core/java/android/net/ITestNetworkManager.aidl rename to packages/Connectivity/framework/src/android/net/ITestNetworkManager.aidl diff --git a/core/java/android/net/InetAddresses.java b/packages/Connectivity/framework/src/android/net/InetAddresses.java similarity index 100% rename from core/java/android/net/InetAddresses.java rename to packages/Connectivity/framework/src/android/net/InetAddresses.java diff --git a/core/java/android/net/InterfaceConfiguration.aidl b/packages/Connectivity/framework/src/android/net/InterfaceConfiguration.aidl similarity index 100% rename from core/java/android/net/InterfaceConfiguration.aidl rename to packages/Connectivity/framework/src/android/net/InterfaceConfiguration.aidl diff --git a/core/java/android/net/InvalidPacketException.java b/packages/Connectivity/framework/src/android/net/InvalidPacketException.java similarity index 100% rename from core/java/android/net/InvalidPacketException.java rename to packages/Connectivity/framework/src/android/net/InvalidPacketException.java diff --git a/core/java/android/net/IpConfiguration.aidl b/packages/Connectivity/framework/src/android/net/IpConfiguration.aidl similarity index 100% rename from core/java/android/net/IpConfiguration.aidl rename to packages/Connectivity/framework/src/android/net/IpConfiguration.aidl diff --git a/core/java/android/net/IpConfiguration.java b/packages/Connectivity/framework/src/android/net/IpConfiguration.java similarity index 100% rename from core/java/android/net/IpConfiguration.java rename to packages/Connectivity/framework/src/android/net/IpConfiguration.java diff --git a/core/java/android/net/IpPrefix.aidl b/packages/Connectivity/framework/src/android/net/IpPrefix.aidl similarity index 100% rename from core/java/android/net/IpPrefix.aidl rename to packages/Connectivity/framework/src/android/net/IpPrefix.aidl diff --git a/core/java/android/net/IpPrefix.java b/packages/Connectivity/framework/src/android/net/IpPrefix.java similarity index 100% rename from core/java/android/net/IpPrefix.java rename to packages/Connectivity/framework/src/android/net/IpPrefix.java diff --git a/core/java/android/net/KeepalivePacketData.aidl b/packages/Connectivity/framework/src/android/net/KeepalivePacketData.aidl similarity index 100% rename from core/java/android/net/KeepalivePacketData.aidl rename to packages/Connectivity/framework/src/android/net/KeepalivePacketData.aidl diff --git a/core/java/android/net/KeepalivePacketData.java b/packages/Connectivity/framework/src/android/net/KeepalivePacketData.java similarity index 100% rename from core/java/android/net/KeepalivePacketData.java rename to packages/Connectivity/framework/src/android/net/KeepalivePacketData.java diff --git a/core/java/android/net/LinkAddress.aidl b/packages/Connectivity/framework/src/android/net/LinkAddress.aidl similarity index 100% rename from core/java/android/net/LinkAddress.aidl rename to packages/Connectivity/framework/src/android/net/LinkAddress.aidl diff --git a/core/java/android/net/LinkAddress.java b/packages/Connectivity/framework/src/android/net/LinkAddress.java similarity index 100% rename from core/java/android/net/LinkAddress.java rename to packages/Connectivity/framework/src/android/net/LinkAddress.java diff --git a/core/java/android/net/LinkProperties.aidl b/packages/Connectivity/framework/src/android/net/LinkProperties.aidl similarity index 100% rename from core/java/android/net/LinkProperties.aidl rename to packages/Connectivity/framework/src/android/net/LinkProperties.aidl diff --git a/core/java/android/net/LinkProperties.java b/packages/Connectivity/framework/src/android/net/LinkProperties.java similarity index 100% rename from core/java/android/net/LinkProperties.java rename to packages/Connectivity/framework/src/android/net/LinkProperties.java diff --git a/core/java/android/net/MacAddress.aidl b/packages/Connectivity/framework/src/android/net/MacAddress.aidl similarity index 100% rename from core/java/android/net/MacAddress.aidl rename to packages/Connectivity/framework/src/android/net/MacAddress.aidl diff --git a/core/java/android/net/MacAddress.java b/packages/Connectivity/framework/src/android/net/MacAddress.java similarity index 100% rename from core/java/android/net/MacAddress.java rename to packages/Connectivity/framework/src/android/net/MacAddress.java diff --git a/core/java/android/net/NattKeepalivePacketData.java b/packages/Connectivity/framework/src/android/net/NattKeepalivePacketData.java similarity index 100% rename from core/java/android/net/NattKeepalivePacketData.java rename to packages/Connectivity/framework/src/android/net/NattKeepalivePacketData.java diff --git a/core/java/android/net/NattSocketKeepalive.java b/packages/Connectivity/framework/src/android/net/NattSocketKeepalive.java similarity index 100% rename from core/java/android/net/NattSocketKeepalive.java rename to packages/Connectivity/framework/src/android/net/NattSocketKeepalive.java diff --git a/core/java/android/net/Network.aidl b/packages/Connectivity/framework/src/android/net/Network.aidl similarity index 100% rename from core/java/android/net/Network.aidl rename to packages/Connectivity/framework/src/android/net/Network.aidl diff --git a/core/java/android/net/Network.java b/packages/Connectivity/framework/src/android/net/Network.java similarity index 100% rename from core/java/android/net/Network.java rename to packages/Connectivity/framework/src/android/net/Network.java diff --git a/core/java/android/net/NetworkAgent.java b/packages/Connectivity/framework/src/android/net/NetworkAgent.java similarity index 100% rename from core/java/android/net/NetworkAgent.java rename to packages/Connectivity/framework/src/android/net/NetworkAgent.java diff --git a/core/java/android/net/NetworkAgentConfig.aidl b/packages/Connectivity/framework/src/android/net/NetworkAgentConfig.aidl similarity index 100% rename from core/java/android/net/NetworkAgentConfig.aidl rename to packages/Connectivity/framework/src/android/net/NetworkAgentConfig.aidl diff --git a/core/java/android/net/NetworkAgentConfig.java b/packages/Connectivity/framework/src/android/net/NetworkAgentConfig.java similarity index 100% rename from core/java/android/net/NetworkAgentConfig.java rename to packages/Connectivity/framework/src/android/net/NetworkAgentConfig.java diff --git a/core/java/android/net/NetworkCapabilities.aidl b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.aidl similarity index 100% rename from core/java/android/net/NetworkCapabilities.aidl rename to packages/Connectivity/framework/src/android/net/NetworkCapabilities.aidl diff --git a/core/java/android/net/NetworkCapabilities.java b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java similarity index 100% rename from core/java/android/net/NetworkCapabilities.java rename to packages/Connectivity/framework/src/android/net/NetworkCapabilities.java diff --git a/core/java/android/net/NetworkConfig.java b/packages/Connectivity/framework/src/android/net/NetworkConfig.java similarity index 100% rename from core/java/android/net/NetworkConfig.java rename to packages/Connectivity/framework/src/android/net/NetworkConfig.java diff --git a/core/java/android/net/NetworkInfo.aidl b/packages/Connectivity/framework/src/android/net/NetworkInfo.aidl similarity index 100% rename from core/java/android/net/NetworkInfo.aidl rename to packages/Connectivity/framework/src/android/net/NetworkInfo.aidl diff --git a/core/java/android/net/NetworkInfo.java b/packages/Connectivity/framework/src/android/net/NetworkInfo.java similarity index 100% rename from core/java/android/net/NetworkInfo.java rename to packages/Connectivity/framework/src/android/net/NetworkInfo.java diff --git a/core/java/android/net/NetworkProvider.java b/packages/Connectivity/framework/src/android/net/NetworkProvider.java similarity index 100% rename from core/java/android/net/NetworkProvider.java rename to packages/Connectivity/framework/src/android/net/NetworkProvider.java diff --git a/core/java/android/net/NetworkRequest.aidl b/packages/Connectivity/framework/src/android/net/NetworkRequest.aidl similarity index 100% rename from core/java/android/net/NetworkRequest.aidl rename to packages/Connectivity/framework/src/android/net/NetworkRequest.aidl diff --git a/core/java/android/net/NetworkRequest.java b/packages/Connectivity/framework/src/android/net/NetworkRequest.java similarity index 100% rename from core/java/android/net/NetworkRequest.java rename to packages/Connectivity/framework/src/android/net/NetworkRequest.java diff --git a/core/java/android/net/NetworkUtils.java b/packages/Connectivity/framework/src/android/net/NetworkUtils.java similarity index 100% rename from core/java/android/net/NetworkUtils.java rename to packages/Connectivity/framework/src/android/net/NetworkUtils.java diff --git a/core/java/android/net/PacProxySelector.java b/packages/Connectivity/framework/src/android/net/PacProxySelector.java similarity index 100% rename from core/java/android/net/PacProxySelector.java rename to packages/Connectivity/framework/src/android/net/PacProxySelector.java diff --git a/core/java/android/net/Proxy.java b/packages/Connectivity/framework/src/android/net/Proxy.java similarity index 100% rename from core/java/android/net/Proxy.java rename to packages/Connectivity/framework/src/android/net/Proxy.java diff --git a/core/java/android/net/ProxyInfo.aidl b/packages/Connectivity/framework/src/android/net/ProxyInfo.aidl similarity index 100% rename from core/java/android/net/ProxyInfo.aidl rename to packages/Connectivity/framework/src/android/net/ProxyInfo.aidl diff --git a/core/java/android/net/ProxyInfo.java b/packages/Connectivity/framework/src/android/net/ProxyInfo.java similarity index 100% rename from core/java/android/net/ProxyInfo.java rename to packages/Connectivity/framework/src/android/net/ProxyInfo.java diff --git a/core/java/android/net/RouteInfo.aidl b/packages/Connectivity/framework/src/android/net/RouteInfo.aidl similarity index 100% rename from core/java/android/net/RouteInfo.aidl rename to packages/Connectivity/framework/src/android/net/RouteInfo.aidl diff --git a/core/java/android/net/RouteInfo.java b/packages/Connectivity/framework/src/android/net/RouteInfo.java similarity index 100% rename from core/java/android/net/RouteInfo.java rename to packages/Connectivity/framework/src/android/net/RouteInfo.java diff --git a/core/java/android/net/SocketKeepalive.java b/packages/Connectivity/framework/src/android/net/SocketKeepalive.java similarity index 100% rename from core/java/android/net/SocketKeepalive.java rename to packages/Connectivity/framework/src/android/net/SocketKeepalive.java diff --git a/core/java/android/net/StaticIpConfiguration.aidl b/packages/Connectivity/framework/src/android/net/StaticIpConfiguration.aidl similarity index 100% rename from core/java/android/net/StaticIpConfiguration.aidl rename to packages/Connectivity/framework/src/android/net/StaticIpConfiguration.aidl diff --git a/core/java/android/net/StaticIpConfiguration.java b/packages/Connectivity/framework/src/android/net/StaticIpConfiguration.java similarity index 100% rename from core/java/android/net/StaticIpConfiguration.java rename to packages/Connectivity/framework/src/android/net/StaticIpConfiguration.java diff --git a/core/java/android/net/TcpKeepalivePacketData.java b/packages/Connectivity/framework/src/android/net/TcpKeepalivePacketData.java similarity index 100% rename from core/java/android/net/TcpKeepalivePacketData.java rename to packages/Connectivity/framework/src/android/net/TcpKeepalivePacketData.java diff --git a/core/java/android/net/TcpRepairWindow.java b/packages/Connectivity/framework/src/android/net/TcpRepairWindow.java similarity index 100% rename from core/java/android/net/TcpRepairWindow.java rename to packages/Connectivity/framework/src/android/net/TcpRepairWindow.java diff --git a/core/java/android/net/TcpSocketKeepalive.java b/packages/Connectivity/framework/src/android/net/TcpSocketKeepalive.java similarity index 100% rename from core/java/android/net/TcpSocketKeepalive.java rename to packages/Connectivity/framework/src/android/net/TcpSocketKeepalive.java diff --git a/core/java/android/net/TestNetworkInterface.aidl b/packages/Connectivity/framework/src/android/net/TestNetworkInterface.aidl similarity index 100% rename from core/java/android/net/TestNetworkInterface.aidl rename to packages/Connectivity/framework/src/android/net/TestNetworkInterface.aidl diff --git a/core/java/android/net/TestNetworkInterface.java b/packages/Connectivity/framework/src/android/net/TestNetworkInterface.java similarity index 100% rename from core/java/android/net/TestNetworkInterface.java rename to packages/Connectivity/framework/src/android/net/TestNetworkInterface.java diff --git a/core/java/android/net/TestNetworkManager.java b/packages/Connectivity/framework/src/android/net/TestNetworkManager.java similarity index 100% rename from core/java/android/net/TestNetworkManager.java rename to packages/Connectivity/framework/src/android/net/TestNetworkManager.java diff --git a/core/java/android/net/TransportInfo.java b/packages/Connectivity/framework/src/android/net/TransportInfo.java similarity index 100% rename from core/java/android/net/TransportInfo.java rename to packages/Connectivity/framework/src/android/net/TransportInfo.java diff --git a/core/java/android/net/UidRange.aidl b/packages/Connectivity/framework/src/android/net/UidRange.aidl similarity index 100% rename from core/java/android/net/UidRange.aidl rename to packages/Connectivity/framework/src/android/net/UidRange.aidl diff --git a/core/java/android/net/VpnManager.java b/packages/Connectivity/framework/src/android/net/VpnManager.java similarity index 100% rename from core/java/android/net/VpnManager.java rename to packages/Connectivity/framework/src/android/net/VpnManager.java diff --git a/core/java/android/net/VpnService.java b/packages/Connectivity/framework/src/android/net/VpnService.java similarity index 100% rename from core/java/android/net/VpnService.java rename to packages/Connectivity/framework/src/android/net/VpnService.java diff --git a/core/java/android/net/apf/ApfCapabilities.aidl b/packages/Connectivity/framework/src/android/net/apf/ApfCapabilities.aidl similarity index 100% rename from core/java/android/net/apf/ApfCapabilities.aidl rename to packages/Connectivity/framework/src/android/net/apf/ApfCapabilities.aidl diff --git a/core/java/android/net/apf/ApfCapabilities.java b/packages/Connectivity/framework/src/android/net/apf/ApfCapabilities.java similarity index 100% rename from core/java/android/net/apf/ApfCapabilities.java rename to packages/Connectivity/framework/src/android/net/apf/ApfCapabilities.java diff --git a/core/java/android/net/util/DnsUtils.java b/packages/Connectivity/framework/src/android/net/util/DnsUtils.java similarity index 100% rename from core/java/android/net/util/DnsUtils.java rename to packages/Connectivity/framework/src/android/net/util/DnsUtils.java diff --git a/core/java/android/net/util/KeepaliveUtils.java b/packages/Connectivity/framework/src/android/net/util/KeepaliveUtils.java similarity index 100% rename from core/java/android/net/util/KeepaliveUtils.java rename to packages/Connectivity/framework/src/android/net/util/KeepaliveUtils.java diff --git a/core/java/android/net/util/MultinetworkPolicyTracker.java b/packages/Connectivity/framework/src/android/net/util/MultinetworkPolicyTracker.java similarity index 100% rename from core/java/android/net/util/MultinetworkPolicyTracker.java rename to packages/Connectivity/framework/src/android/net/util/MultinetworkPolicyTracker.java diff --git a/core/java/android/net/util/SocketUtils.java b/packages/Connectivity/framework/src/android/net/util/SocketUtils.java similarity index 100% rename from core/java/android/net/util/SocketUtils.java rename to packages/Connectivity/framework/src/android/net/util/SocketUtils.java