LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move IpSec APIs to Connectivity module

Browse Source 
(cherry picked from commit 68ca373929)
Bug: 204153604
Test: TH
Change-Id: If4afabdc65ed2ac3e918af1d4a03c4c9173c4a3c
Merged-In: If4afabdc65ed2ac3e918af1d4a03c4c9173c4a3c
This commit is contained in:
Aaron Huang
2022-01-06 19:30:43 +08:00
parent a8ae24410d
commit 2e778ee46b
7 changed files with 346 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
service-t/src/com/android/server/ConnectivityServiceInitializer.java
View File

@@ -28,6 +28,7 @@ import com.android.modules.utils.build.SdkLevel;
public final class ConnectivityServiceInitializer extends SystemService {
private static final String TAG = ConnectivityServiceInitializer.class.getSimpleName();
private final ConnectivityService mConnectivity;
private final IpSecService mIpSecService;
private final NsdService mNsdService;
public ConnectivityServiceInitializer(Context context) {
@@ -35,6 +36,7 @@ public final class ConnectivityServiceInitializer extends SystemService {
// Load JNI libraries used by ConnectivityService and its dependencies
System.loadLibrary("service-connectivity");
mConnectivity = new ConnectivityService(context);
mIpSecService = createIpSecService(context);
mNsdService = createNsdService(context);
}
@@ -43,12 +45,27 @@ public final class ConnectivityServiceInitializer extends SystemService {
Log.i(TAG, "Registering " + Context.CONNECTIVITY_SERVICE);
publishBinderService(Context.CONNECTIVITY_SERVICE, mConnectivity,
/* allowIsolated= */ false);
if (mIpSecService != null) {
Log.i(TAG, "Registering " + Context.IPSEC_SERVICE);
publishBinderService(Context.IPSEC_SERVICE, mIpSecService, /* allowIsolated= */ false);
}
if (mNsdService != null) {
Log.i(TAG, "Registering " + Context.NSD_SERVICE);
publishBinderService(Context.NSD_SERVICE, mNsdService, /* allowIsolated= */ false);
}
}
/**
* Return IpSecService instance, or null if current SDK is lower than T.
*/
private IpSecService createIpSecService(final Context context) {
if (!SdkLevel.isAtLeastT()) return null;
return new IpSecService(context);
}
/** Return NsdService instance or null if current SDK is lower than T */
private NsdService createNsdService(final Context context) {
if (!SdkLevel.isAtLeastT()) return null;