Merge "Expose TEST_TAP_PREFIX as system API"
This commit is contained in:
@@ -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 {
|
||||||
|
|||||||
@@ -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";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user