From 9bf30999cc44ee23f0c66f9f6f6f173bc337abe0 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Wed, 12 May 2021 14:15:24 +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 Change-Id: I26d1a274058fa38763ad4f605549d880865b4d76 --- packages/Connectivity/service/Android.bp | 2 +- .../Connectivity/service/lint-baseline.xml | 12 ++++---- .../android/server/ConnectivityService.java | 0 .../ConnectivityServiceInitializer.java | 0 .../src}/com/android/server/NetIdManager.java | 0 .../android/server/TestNetworkService.java | 0 .../connectivity/AutodestructReference.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 .../android/server/connectivity/OsCompat.java | 0 .../connectivity/PermissionMonitor.java | 0 .../ProfileNetworkPreferences.java | 0 .../server/connectivity/ProxyTracker.java | 0 .../QosCallbackAgentConnection.java | 0 .../connectivity/QosCallbackTracker.java | 0 .../connectivity/TcpKeepaliveController.java | 0 services/core/Android.bp | 30 ------------------- 26 files changed, 7 insertions(+), 37 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/NetIdManager.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/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/OsCompat.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/ProfileNetworkPreferences.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 20ccf060118c3..813a239bdaf28 100644 --- a/packages/Connectivity/service/Android.bp +++ b/packages/Connectivity/service/Android.bp @@ -54,7 +54,7 @@ java_library { sdk_version: "system_server_current", min_sdk_version: "30", srcs: [ - ":connectivity-service-srcs", + "src/**/*.java", ":framework-connectivity-shared-srcs", ":services-connectivity-shared-srcs", // TODO: move to net-utils-device-common, enable shrink optimization to avoid extra classes diff --git a/packages/Connectivity/service/lint-baseline.xml b/packages/Connectivity/service/lint-baseline.xml index 35ea2d378e93d..95c169ce64a36 100644 --- a/packages/Connectivity/service/lint-baseline.xml +++ b/packages/Connectivity/service/lint-baseline.xml @@ -7,8 +7,8 @@ errorLine1=" if (tm.isDataCapable()) {" errorLine2=" ~~~~~~~~~~~~~"> @@ -18,8 +18,8 @@ errorLine1=" mUserAllContext.sendStickyBroadcast(intent, options);" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -29,8 +29,8 @@ errorLine1=" final int callingVersion = pm.getTargetSdkVersion(callingPackageName);" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> 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/NetIdManager.java b/packages/Connectivity/service/src/com/android/server/NetIdManager.java similarity index 100% rename from services/core/java/com/android/server/NetIdManager.java rename to packages/Connectivity/service/src/com/android/server/NetIdManager.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/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/OsCompat.java b/packages/Connectivity/service/src/com/android/server/connectivity/OsCompat.java similarity index 100% rename from services/core/java/com/android/server/connectivity/OsCompat.java rename to packages/Connectivity/service/src/com/android/server/connectivity/OsCompat.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/ProfileNetworkPreferences.java b/packages/Connectivity/service/src/com/android/server/connectivity/ProfileNetworkPreferences.java similarity index 100% rename from services/core/java/com/android/server/connectivity/ProfileNetworkPreferences.java rename to packages/Connectivity/service/src/com/android/server/connectivity/ProfileNetworkPreferences.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 5dc11c588ef2a..44307ef73fe0e 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -21,7 +21,6 @@ filegroup { name: "services.core-sources", srcs: ["java/**/*.java"], exclude_srcs: [ - ":connectivity-service-srcs", ":services.core-sources-am-wm" ], path: "java", @@ -214,32 +213,3 @@ filegroup { ], } -// 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/NetIdManager.java", - "java/com/android/server/TestNetworkService.java", - "java/com/android/server/connectivity/AutodestructReference.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/OsCompat.java", - "java/com/android/server/connectivity/PermissionMonitor.java", - "java/com/android/server/connectivity/ProfileNetworkPreferences.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", - ], -}