Merge "Expose TEST_TAP_PREFIX as system API"

This commit is contained in:
Lorenzo Colitti
2021-02-17 12:28:56 +00:00
committed by Gerrit Code Review
2 changed files with 1 additions and 1 deletions

View File

@@ -60,6 +60,7 @@ package android.net {
method @NonNull public android.net.TestNetworkInterface createTunInterface(@NonNull java.util.Collection<android.net.LinkAddress>); method @NonNull public android.net.TestNetworkInterface createTunInterface(@NonNull java.util.Collection<android.net.LinkAddress>);
method public void setupTestNetwork(@NonNull String, @NonNull android.os.IBinder); method public void setupTestNetwork(@NonNull String, @NonNull android.os.IBinder);
method public void teardownTestNetwork(@NonNull android.net.Network); method public void teardownTestNetwork(@NonNull android.net.Network);
field public static final String TEST_TAP_PREFIX = "testtap";
} }
public final class UnderlyingNetworkInfo implements android.os.Parcelable { public final class UnderlyingNetworkInfo implements android.os.Parcelable {

View File

@@ -41,7 +41,6 @@ public class TestNetworkManager {
/** /**
* Prefix for tap interfaces created by this class. * Prefix for tap interfaces created by this class.
* @hide
*/ */
public static final String TEST_TAP_PREFIX = "testtap"; public static final String TEST_TAP_PREFIX = "testtap";