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
This commit is contained in:
Remi NGUYEN VAN
2021-05-13 12:53:15 +00:00
parent b566375c5d
commit 4febb21cb6
22 changed files with 63 additions and 1 deletions

View File

@@ -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",

View File

@@ -0,0 +1,28 @@
/*
* Copyright (C) 2018 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;
/**
* A class encapsulating various constants used by Connectivity.
* TODO : remove this class.
* @hide
*/
public class ConnectivityConstants {
// VPNs typically have priority over other networks. Give them a score that will
// let them win every single time.
public static final int VPN_DEFAULT_SCORE = 101;
}

View File

@@ -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);
}
}