From c0b5ead56d6c1ad30148bd430c356682da8c9dc5 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 --- service/Android.bp | 2 +- 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 | 34 +++++++++++++++++++ .../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 25 files changed, 41 insertions(+), 7 deletions(-) rename {services/core/java => service/src}/com/android/server/ConnectivityService.java (100%) rename {services/core/java => service/src}/com/android/server/ConnectivityServiceInitializer.java (100%) rename {services/core/java => service/src}/com/android/server/NetIdManager.java (100%) rename {services/core/java => service/src}/com/android/server/TestNetworkService.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/AutodestructReference.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/DnsManager.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/FullScore.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/KeepaliveTracker.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/LingerMonitor.java (100%) create mode 100644 service/src/com/android/server/connectivity/MockableSystemProperties.java rename {services/core/java => service/src}/com/android/server/connectivity/Nat464Xlat.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/NetworkAgentInfo.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/NetworkDiagnostics.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/NetworkNotificationManager.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/NetworkOffer.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/NetworkRanker.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/OsCompat.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/PermissionMonitor.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/ProfileNetworkPreferences.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/ProxyTracker.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/QosCallbackAgentConnection.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/QosCallbackTracker.java (100%) rename {services/core/java => service/src}/com/android/server/connectivity/TcpKeepaliveController.java (100%) diff --git a/service/Android.bp b/service/Android.bp index 20ccf06011..813a239bda 100644 --- a/service/Android.bp +++ b/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/service/lint-baseline.xml b/service/lint-baseline.xml index 35ea2d378e..95c169ce64 100644 --- a/service/lint-baseline.xml +++ b/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/service/src/com/android/server/ConnectivityService.java similarity index 100% rename from services/core/java/com/android/server/ConnectivityService.java rename to service/src/com/android/server/ConnectivityService.java diff --git a/services/core/java/com/android/server/ConnectivityServiceInitializer.java b/service/src/com/android/server/ConnectivityServiceInitializer.java similarity index 100% rename from services/core/java/com/android/server/ConnectivityServiceInitializer.java rename to service/src/com/android/server/ConnectivityServiceInitializer.java diff --git a/services/core/java/com/android/server/NetIdManager.java b/service/src/com/android/server/NetIdManager.java similarity index 100% rename from services/core/java/com/android/server/NetIdManager.java rename to service/src/com/android/server/NetIdManager.java diff --git a/services/core/java/com/android/server/TestNetworkService.java b/service/src/com/android/server/TestNetworkService.java similarity index 100% rename from services/core/java/com/android/server/TestNetworkService.java rename to service/src/com/android/server/TestNetworkService.java diff --git a/services/core/java/com/android/server/connectivity/AutodestructReference.java b/service/src/com/android/server/connectivity/AutodestructReference.java similarity index 100% rename from services/core/java/com/android/server/connectivity/AutodestructReference.java rename to service/src/com/android/server/connectivity/AutodestructReference.java diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/service/src/com/android/server/connectivity/DnsManager.java similarity index 100% rename from services/core/java/com/android/server/connectivity/DnsManager.java rename to service/src/com/android/server/connectivity/DnsManager.java diff --git a/services/core/java/com/android/server/connectivity/FullScore.java b/service/src/com/android/server/connectivity/FullScore.java similarity index 100% rename from services/core/java/com/android/server/connectivity/FullScore.java rename to service/src/com/android/server/connectivity/FullScore.java diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/service/src/com/android/server/connectivity/KeepaliveTracker.java similarity index 100% rename from services/core/java/com/android/server/connectivity/KeepaliveTracker.java rename to service/src/com/android/server/connectivity/KeepaliveTracker.java diff --git a/services/core/java/com/android/server/connectivity/LingerMonitor.java b/service/src/com/android/server/connectivity/LingerMonitor.java similarity index 100% rename from services/core/java/com/android/server/connectivity/LingerMonitor.java rename to service/src/com/android/server/connectivity/LingerMonitor.java diff --git a/service/src/com/android/server/connectivity/MockableSystemProperties.java b/service/src/com/android/server/connectivity/MockableSystemProperties.java new file mode 100644 index 0000000000..a25b89ac03 --- /dev/null +++ b/service/src/com/android/server/connectivity/MockableSystemProperties.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.connectivity; + +import android.os.SystemProperties; + +public class MockableSystemProperties { + + public String get(String key) { + return SystemProperties.get(key); + } + + public int getInt(String key, int def) { + return SystemProperties.getInt(key, def); + } + + public boolean getBoolean(String key, boolean def) { + return SystemProperties.getBoolean(key, def); + } +} diff --git a/services/core/java/com/android/server/connectivity/Nat464Xlat.java b/service/src/com/android/server/connectivity/Nat464Xlat.java similarity index 100% rename from services/core/java/com/android/server/connectivity/Nat464Xlat.java rename to service/src/com/android/server/connectivity/Nat464Xlat.java diff --git a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java b/service/src/com/android/server/connectivity/NetworkAgentInfo.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkAgentInfo.java rename to service/src/com/android/server/connectivity/NetworkAgentInfo.java diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/service/src/com/android/server/connectivity/NetworkDiagnostics.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkDiagnostics.java rename to service/src/com/android/server/connectivity/NetworkDiagnostics.java diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/service/src/com/android/server/connectivity/NetworkNotificationManager.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkNotificationManager.java rename to service/src/com/android/server/connectivity/NetworkNotificationManager.java diff --git a/services/core/java/com/android/server/connectivity/NetworkOffer.java b/service/src/com/android/server/connectivity/NetworkOffer.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkOffer.java rename to service/src/com/android/server/connectivity/NetworkOffer.java diff --git a/services/core/java/com/android/server/connectivity/NetworkRanker.java b/service/src/com/android/server/connectivity/NetworkRanker.java similarity index 100% rename from services/core/java/com/android/server/connectivity/NetworkRanker.java rename to service/src/com/android/server/connectivity/NetworkRanker.java diff --git a/services/core/java/com/android/server/connectivity/OsCompat.java b/service/src/com/android/server/connectivity/OsCompat.java similarity index 100% rename from services/core/java/com/android/server/connectivity/OsCompat.java rename to service/src/com/android/server/connectivity/OsCompat.java diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java similarity index 100% rename from services/core/java/com/android/server/connectivity/PermissionMonitor.java rename to service/src/com/android/server/connectivity/PermissionMonitor.java diff --git a/services/core/java/com/android/server/connectivity/ProfileNetworkPreferences.java b/service/src/com/android/server/connectivity/ProfileNetworkPreferences.java similarity index 100% rename from services/core/java/com/android/server/connectivity/ProfileNetworkPreferences.java rename to service/src/com/android/server/connectivity/ProfileNetworkPreferences.java diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/service/src/com/android/server/connectivity/ProxyTracker.java similarity index 100% rename from services/core/java/com/android/server/connectivity/ProxyTracker.java rename to service/src/com/android/server/connectivity/ProxyTracker.java diff --git a/services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java b/service/src/com/android/server/connectivity/QosCallbackAgentConnection.java similarity index 100% rename from services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java rename to service/src/com/android/server/connectivity/QosCallbackAgentConnection.java diff --git a/services/core/java/com/android/server/connectivity/QosCallbackTracker.java b/service/src/com/android/server/connectivity/QosCallbackTracker.java similarity index 100% rename from services/core/java/com/android/server/connectivity/QosCallbackTracker.java rename to service/src/com/android/server/connectivity/QosCallbackTracker.java diff --git a/services/core/java/com/android/server/connectivity/TcpKeepaliveController.java b/service/src/com/android/server/connectivity/TcpKeepaliveController.java similarity index 100% rename from services/core/java/com/android/server/connectivity/TcpKeepaliveController.java rename to service/src/com/android/server/connectivity/TcpKeepaliveController.java