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

Merge "Make Ethernet interfaces more testable." am: cabe5e5615 am: 5b7eccf20d

Browse Source 
Change-Id: I5a73dc5ad6576573bcac6c7ac6f1270dfbb97470
This commit is contained in:
Lorenzo Colitti
2020-03-19 11:46:55 +00:00
committed by Automerger Merge Worker
parent b45f655988 5b7eccf20d
commit 5a82f3c4ad
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/net/TestNetworkManager.java
View File

@@ -30,6 +30,18 @@ import com.android.internal.util.Preconditions;
*/ */
@TestApi @TestApi
public class TestNetworkManager { public class TestNetworkManager {
/**
* Prefix for tun interfaces created by this class.
* @hide
*/
public static final String TEST_TUN_PREFIX = "testtun";
/**
* Prefix for tap interfaces created by this class.
* @hide
*/
public static final String TEST_TAP_PREFIX = "testtap";
@NonNull private static final String TAG = TestNetworkManager.class.getSimpleName(); @NonNull private static final String TAG = TestNetworkManager.class.getSimpleName();
@NonNull private final ITestNetworkManager mService; @NonNull private final ITestNetworkManager mService;

5
services/core/java/com/android/server/TestNetworkService.java
View File

@@ -16,6 +16,9 @@
package com.android.server; package com.android.server;
import static android.net.TestNetworkManager.TEST_TAP_PREFIX;
import static android.net.TestNetworkManager.TEST_TUN_PREFIX;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
@@ -60,8 +63,6 @@ import java.util.concurrent.atomic.AtomicInteger;
class TestNetworkService extends ITestNetworkManager.Stub { class TestNetworkService extends ITestNetworkManager.Stub {
@NonNull private static final String TAG = TestNetworkService.class.getSimpleName(); @NonNull private static final String TAG = TestNetworkService.class.getSimpleName();
@NonNull private static final String TEST_NETWORK_TYPE = "TEST_NETWORK"; @NonNull private static final String TEST_NETWORK_TYPE = "TEST_NETWORK";
@NonNull private static final String TEST_TUN_PREFIX = "testtun";
@NonNull private static final String TEST_TAP_PREFIX = "testtap";
@NonNull private static final AtomicInteger sTestTunIndex = new AtomicInteger(); @NonNull private static final AtomicInteger sTestTunIndex = new AtomicInteger();
@NonNull private final Context mContext; @NonNull private final Context mContext;