Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move the VPN code out of packages/Connectivity." am: 8269d21dec am: 6011d5240c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6c73f67cc7e81025d8c55a437ada9ba4fce34ca
This commit is contained in:
Lorenzo Colitti
2021-02-15 12:34:47 +00:00
committed by Automerger Merge Worker
parent b79cddd608 6011d5240c
commit f684b8d431
7 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
packages/Connectivity/framework/src/android/net/VpnManager.java → core/java/android/net/VpnManager.java
View File

0
packages/Connectivity/framework/src/android/net/VpnService.java → core/java/android/net/VpnService.java
View File

1
packages/Connectivity/service/Android.bp
View File

@@ -25,7 +25,6 @@ cc_library_shared {
], ],
srcs: [ srcs: [
"jni/com_android_server_TestNetworkService.cpp", "jni/com_android_server_TestNetworkService.cpp",
"jni/com_android_server_connectivity_Vpn.cpp",
"jni/onload.cpp", "jni/onload.cpp",
], ],
shared_libs: [ shared_libs: [

6
packages/Connectivity/service/jni/onload.cpp
View File

@@ -19,7 +19,6 @@
namespace android { namespace android {
int register_android_server_connectivity_Vpn(JNIEnv* env);
int register_android_server_TestNetworkService(JNIEnv* env); int register_android_server_TestNetworkService(JNIEnv* env);
extern "C" jint JNI_OnLoad(JavaVM* vm, void*) { extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
@@ -29,12 +28,11 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
return JNI_ERR; return JNI_ERR;
} }
if (register_android_server_connectivity_Vpn(env) < 0 if (register_android_server_TestNetworkService(env) < 0) {
|| register_android_server_TestNetworkService(env) < 0) {
return JNI_ERR; return JNI_ERR;
} }
return JNI_VERSION_1_6; return JNI_VERSION_1_6;
} }
}; };

1
services/core/jni/Android.bp
View File

@@ -28,6 +28,7 @@ cc_library_static {
"com_android_server_am_BatteryStatsService.cpp", "com_android_server_am_BatteryStatsService.cpp",
"com_android_server_ConsumerIrService.cpp", "com_android_server_ConsumerIrService.cpp",
"com_android_server_devicepolicy_CryptoTestHelper.cpp", "com_android_server_devicepolicy_CryptoTestHelper.cpp",
"com_android_server_connectivity_Vpn.cpp",
"com_android_server_gpu_GpuService.cpp", "com_android_server_gpu_GpuService.cpp",
"com_android_server_HardwarePropertiesManagerService.cpp", "com_android_server_HardwarePropertiesManagerService.cpp",
"com_android_server_input_InputManagerService.cpp", "com_android_server_input_InputManagerService.cpp",

0
packages/Connectivity/service/jni/com_android_server_connectivity_Vpn.cpp → services/core/jni/com_android_server_connectivity_Vpn.cpp
View File

2
services/core/jni/onload.cpp
View File

@@ -40,6 +40,7 @@ int register_android_server_UsbHostManager(JNIEnv* env);
int register_android_server_vr_VrManagerService(JNIEnv* env); int register_android_server_vr_VrManagerService(JNIEnv* env);
int register_android_server_VibratorService(JNIEnv* env); int register_android_server_VibratorService(JNIEnv* env);
int register_android_server_location_GnssLocationProvider(JNIEnv* env); int register_android_server_location_GnssLocationProvider(JNIEnv* env);
int register_android_server_connectivity_Vpn(JNIEnv* env);
int register_android_server_devicepolicy_CryptoTestHelper(JNIEnv*); int register_android_server_devicepolicy_CryptoTestHelper(JNIEnv*);
int register_android_server_tv_TvUinputBridge(JNIEnv* env); int register_android_server_tv_TvUinputBridge(JNIEnv* env);
int register_android_server_tv_TvInputHal(JNIEnv* env); int register_android_server_tv_TvInputHal(JNIEnv* env);
@@ -91,6 +92,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
register_android_server_VibratorService(env); register_android_server_VibratorService(env);
register_android_server_SystemServer(env); register_android_server_SystemServer(env);
register_android_server_location_GnssLocationProvider(env); register_android_server_location_GnssLocationProvider(env);
register_android_server_connectivity_Vpn(env);
register_android_server_devicepolicy_CryptoTestHelper(env); register_android_server_devicepolicy_CryptoTestHelper(env);
register_android_server_ConsumerIrService(env); register_android_server_ConsumerIrService(env);
register_android_server_BatteryStatsService(env); register_android_server_BatteryStatsService(env);