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

Merge changes from topic "block_port"

Browse Source 
* changes:
  Add connectivity_native_test to Presubmit
  Vendor AIDL interface for port blocking via eBPF
This commit is contained in:
Lorenzo Colitti
2022-04-01 21:46:37 +00:00
committed by Gerrit Code Review
parent 075dd6f8ff b4ab4c3a20
commit 6de87582c1
14 changed files with 792 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import android.util.Log;
import com.android.modules.utils.build.SdkLevel;
import com.android.networkstack.apishim.ConstantsShim;
import com.android.server.connectivity.ConnectivityNativeService;
import com.android.server.ethernet.EthernetService;
import com.android.server.ethernet.EthernetServiceImpl;
import com.android.server.nearby.NearbyService;
@@ -31,6 +32,7 @@ import com.android.server.nearby.NearbyService;
*/
public final class ConnectivityServiceInitializer extends SystemService {
private static final String TAG = ConnectivityServiceInitializer.class.getSimpleName();
private final ConnectivityNativeService mConnectivityNative;
private final ConnectivityService mConnectivity;
private final IpSecService mIpSecService;
private final NsdService mNsdService;
@@ -44,6 +46,7 @@ public final class ConnectivityServiceInitializer extends SystemService {
mEthernetServiceImpl = createEthernetService(context);
mConnectivity = new ConnectivityService(context);
mIpSecService = createIpSecService(context);
mConnectivityNative = createConnectivityNativeService(context);
mNsdService = createNsdService(context);
mNearbyService = createNearbyService(context);
}
@@ -65,6 +68,12 @@ public final class ConnectivityServiceInitializer extends SystemService {
publishBinderService(Context.IPSEC_SERVICE, mIpSecService, /* allowIsolated= */ false);
}
if (mConnectivityNative != null) {
Log.i(TAG, "Registering " + ConnectivityNativeService.SERVICE_NAME);
publishBinderService(ConnectivityNativeService.SERVICE_NAME, mConnectivityNative,
/* allowIsolated= */ false);
}
if (mNsdService != null) {
Log.i(TAG, "Registering " + Context.NSD_SERVICE);
publishBinderService(Context.NSD_SERVICE, mNsdService, /* allowIsolated= */ false);
@@ -98,6 +107,19 @@ public final class ConnectivityServiceInitializer extends SystemService {
return new IpSecService(context);
}
/**
* Return ConnectivityNativeService instance, or null if current SDK is lower than T.
*/
private ConnectivityNativeService createConnectivityNativeService(final Context context) {
if (!SdkLevel.isAtLeastT()) return null;
try {
return new ConnectivityNativeService(context);
} catch (UnsupportedOperationException e) {
Log.d(TAG, "Unable to get ConnectivityNative service", e);
return null;
}
}
/** Return NsdService instance or null if current SDK is lower than T */
private NsdService createNsdService(final Context context) {
if (!SdkLevel.isAtLeastT()) return null;