From 3d97bd9e5e2813ae799d201c434cdd28fedef57f Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 13 May 2021 12:53:15 +0000 Subject: [PATCH] Move connectivity sources to packages/Connectivity The service-connectivity sources should be in packages/modules/Connectivity. Move them to frameworks/base/packages/Connectivity, so that the whole directory can be moved to the dedicated packages/modules/Connectivity git project. Bug: 186628461 Test: m Merged-In: I26d1a274058fa38763ad4f605549d880865b4d76 Change-Id: Ie0562db92ebee269b901926d763ae907bde61b98 --- packages/Connectivity/service/Android.bp | 2 +- .../android/server/ConnectivityService.java | 0 .../ConnectivityServiceInitializer.java | 0 .../android/server/TestNetworkService.java | 0 .../connectivity/AutodestructReference.java | 0 .../connectivity/ConnectivityConstants.java | 0 .../server/connectivity/DnsManager.java | 0 .../server/connectivity/FullScore.java | 0 .../server/connectivity/KeepaliveTracker.java | 0 .../server/connectivity/LingerMonitor.java | 0 .../MockableSystemProperties.java | 0 .../server/connectivity/Nat464Xlat.java | 0 .../server/connectivity/NetworkAgentInfo.java | 0 .../connectivity/NetworkDiagnostics.java | 0 .../NetworkNotificationManager.java | 0 .../server/connectivity/NetworkOffer.java | 0 .../server/connectivity/NetworkRanker.java | 0 .../connectivity/PermissionMonitor.java | 0 .../server/connectivity/ProxyTracker.java | 0 .../QosCallbackAgentConnection.java | 0 .../connectivity/QosCallbackTracker.java | 0 .../connectivity/TcpKeepaliveController.java | 0 services/core/Android.bp | 28 ------------------- 23 files changed, 1 insertion(+), 29 deletions(-) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/ConnectivityService.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/ConnectivityServiceInitializer.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/TestNetworkService.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/AutodestructReference.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/ConnectivityConstants.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/DnsManager.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/FullScore.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/KeepaliveTracker.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/LingerMonitor.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/MockableSystemProperties.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/Nat464Xlat.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/NetworkAgentInfo.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/NetworkDiagnostics.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/NetworkNotificationManager.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/NetworkOffer.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/NetworkRanker.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/PermissionMonitor.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/ProxyTracker.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/QosCallbackAgentConnection.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/QosCallbackTracker.java (100%) rename {services/core/java => packages/Connectivity/service/src}/com/android/server/connectivity/TcpKeepaliveController.java (100%) diff --git a/packages/Connectivity/service/Android.bp b/packages/Connectivity/service/Android.bp index 1330e719e774a..513de1956952e 100644 --- a/packages/Connectivity/service/Android.bp +++ b/packages/Connectivity/service/Android.bp @@ -52,8 +52,8 @@ cc_library_shared { java_library { name: "service-connectivity-pre-jarjar", srcs: [ + "src/**/*.java", ":framework-connectivity-shared-srcs", - ":connectivity-service-srcs", ], libs: [ "android.net.ipsec.ike", diff --git a/services/core/java/com/android/server/ConnectivityService.java b/packages/Connectivity/service/src/com/android/server/ConnectivityService.java similarity index 100% rename from services/core/java/com/android/server/ConnectivityService.java rename to packages/Connectivity/service/src/com/android/server/ConnectivityService.java diff --git a/services/core/java/com/android/server/ConnectivityServiceInitializer.java b/packages/Connectivity/service/src/com/android/server/ConnectivityServiceInitializer.java similarity index 100% rename from services/core/java/com/android/server/ConnectivityServiceInitializer.java rename to packages/Connectivity/service/src/com/android/server/ConnectivityServiceInitializer.java diff --git a/services/core/java/com/android/server/TestNetworkService.java b/packages/Connectivity/service/src/com/android/server/TestNetworkService.java similarity index 100% rename from services/core/java/com/android/server/TestNetworkService.java rename to packages/Connectivity/service/src/com/android/server/TestNetworkService.java diff --git a/services/core/java/com/android/server/connectivity/AutodestructReference.java b/packages/Connectivity/service/src/com/android/server/connectivity/AutodestructReference.java similarity index 100% rename from services/core/java/com/android/server/connectivity/AutodestructReference.java rename to packages/Connectivity/service/src/com/android/server/connectivity/AutodestructReference.java diff --git a/services/core/java/com/android/server/connectivity/ConnectivityConstants.java b/packages/Connectivity/service/src/com/android/server/connectivity/ConnectivityConstants.java similarity index 100% rename from services/core/java/com/android/server/connectivity/ConnectivityConstants.java rename to packages/Connectivity/service/src/com/android/server/connectivity/ConnectivityConstants.java diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/packages/Connectivity/service/src/com/android/server/connectivity/DnsManager.java similarity index 100% rename from services/core/java/com/android/server/connectivity/DnsManager.java rename to packages/Connectivity/service/src/com/android/server/connectivity/DnsManager.java diff --git a/services/core/java/com/android/server/connectivity/FullScore.java b/packages/Connectivity/service/src/com/android/server/connectivity/FullScore.java similarity index 100% rename from services/core/java/com/android/server/connectivity/FullScore.java rename to packages/Connectivity/service/src/com/android/server/connectivity/FullScore.java diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/packages/Connectivity/service/src/com/android/server/connectivity/KeepaliveTracker.java similarity index 100% rename from services/core/java/com/android/server/connectivity/KeepaliveTracker.java rename to packages/Connectivity/service/src/com/android/server/connectivity/KeepaliveTracker.java diff --git a/services/core/java/com/android/server/connectivity/LingerMonitor.java b/packages/Connectivity/service/src/com/android/server/connectivity/LingerMonitor.java similarity index 100% rename from services/core/java/com/android/server/connectivity/LingerMonitor.java rename to packages/Connectivity/service/src/com/android/server/connectivity/LingerMonitor.java diff --git a/services/core/java/com/android/server/connectivity/MockableSystemProperties.java b/packages/Connectivity/service/src/com/android/server/connectivity/MockableSystemProperties.java similarity index 100% rename from services/core/java/com/android/server/connectivity/MockableSystemProperties.java rename to packages/Connectivity/service/src/com/android/server/connectivity/MockableSystemProperties.java diff --git a/services/core/java/com/android/server/connectivity/Nat464Xlat.java b/packages/Connectivity/service/src/com/android/server/connectivity/Nat464Xlat.java similarity index 100% rename from services/core/java/com/android/server/connectivity/Nat464Xlat.java rename to packages/Connectivity/service/src/com/android/server/connectivity/Nat464Xlat.java diff --git a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java b/packages/Connectivity/service/src/com/android/server/connectivity/NetworkAgentInfo.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkAgentInfo.java rename to packages/Connectivity/service/src/com/android/server/connectivity/NetworkAgentInfo.java diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/packages/Connectivity/service/src/com/android/server/connectivity/NetworkDiagnostics.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkDiagnostics.java rename to packages/Connectivity/service/src/com/android/server/connectivity/NetworkDiagnostics.java diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/packages/Connectivity/service/src/com/android/server/connectivity/NetworkNotificationManager.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkNotificationManager.java rename to packages/Connectivity/service/src/com/android/server/connectivity/NetworkNotificationManager.java diff --git a/services/core/java/com/android/server/connectivity/NetworkOffer.java b/packages/Connectivity/service/src/com/android/server/connectivity/NetworkOffer.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkOffer.java rename to packages/Connectivity/service/src/com/android/server/connectivity/NetworkOffer.java diff --git a/services/core/java/com/android/server/connectivity/NetworkRanker.java b/packages/Connectivity/service/src/com/android/server/connectivity/NetworkRanker.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkRanker.java rename to packages/Connectivity/service/src/com/android/server/connectivity/NetworkRanker.java diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/packages/Connectivity/service/src/com/android/server/connectivity/PermissionMonitor.java similarity index 100% rename from services/core/java/com/android/server/connectivity/PermissionMonitor.java rename to packages/Connectivity/service/src/com/android/server/connectivity/PermissionMonitor.java diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/packages/Connectivity/service/src/com/android/server/connectivity/ProxyTracker.java similarity index 100% rename from services/core/java/com/android/server/connectivity/ProxyTracker.java rename to packages/Connectivity/service/src/com/android/server/connectivity/ProxyTracker.java diff --git a/services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java b/packages/Connectivity/service/src/com/android/server/connectivity/QosCallbackAgentConnection.java similarity index 100% rename from services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java rename to packages/Connectivity/service/src/com/android/server/connectivity/QosCallbackAgentConnection.java diff --git a/services/core/java/com/android/server/connectivity/QosCallbackTracker.java b/packages/Connectivity/service/src/com/android/server/connectivity/QosCallbackTracker.java similarity index 100% rename from services/core/java/com/android/server/connectivity/QosCallbackTracker.java rename to packages/Connectivity/service/src/com/android/server/connectivity/QosCallbackTracker.java diff --git a/services/core/java/com/android/server/connectivity/TcpKeepaliveController.java b/packages/Connectivity/service/src/com/android/server/connectivity/TcpKeepaliveController.java similarity index 100% rename from services/core/java/com/android/server/connectivity/TcpKeepaliveController.java rename to packages/Connectivity/service/src/com/android/server/connectivity/TcpKeepaliveController.java diff --git a/services/core/Android.bp b/services/core/Android.bp index 9d505643332f9..706f738d754d5 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -10,7 +10,6 @@ package { filegroup { name: "services.core-sources", srcs: ["java/**/*.java"], - exclude_srcs: [":connectivity-service-srcs"], path: "java", visibility: ["//frameworks/base/services"], } @@ -200,30 +199,3 @@ prebuilt_etc { src: ":services.core.json.gz", } -// TODO: Move connectivity service sources to independent directory. -filegroup { - name: "connectivity-service-srcs", - srcs: [ - "java/com/android/server/ConnectivityService.java", - "java/com/android/server/ConnectivityServiceInitializer.java", - "java/com/android/server/TestNetworkService.java", - "java/com/android/server/connectivity/AutodestructReference.java", - "java/com/android/server/connectivity/ConnectivityConstants.java", - "java/com/android/server/connectivity/DnsManager.java", - "java/com/android/server/connectivity/FullScore.java", - "java/com/android/server/connectivity/KeepaliveTracker.java", - "java/com/android/server/connectivity/LingerMonitor.java", - "java/com/android/server/connectivity/MockableSystemProperties.java", - "java/com/android/server/connectivity/Nat464Xlat.java", - "java/com/android/server/connectivity/NetworkAgentInfo.java", - "java/com/android/server/connectivity/NetworkDiagnostics.java", - "java/com/android/server/connectivity/NetworkNotificationManager.java", - "java/com/android/server/connectivity/NetworkOffer.java", - "java/com/android/server/connectivity/NetworkRanker.java", - "java/com/android/server/connectivity/PermissionMonitor.java", - "java/com/android/server/connectivity/ProxyTracker.java", - "java/com/android/server/connectivity/QosCallbackAgentConnection.java", - "java/com/android/server/connectivity/QosCallbackTracker.java", - "java/com/android/server/connectivity/TcpKeepaliveController.java", - ], -}