Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose TEST_TAP_PREFIX as system API" am: f614cdce9d am: bb6c348b0f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I326fc7a3731c45cde898aeb641cdf065c58ff5db
This commit is contained in:
Lorenzo Colitti
2021-02-17 13:37:53 +00:00
committed by Automerger Merge Worker
parent 457c516204 bb6c348b0f
commit 35447ff76a
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/module-lib-current.txt
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 {

1
packages/Connectivity/framework/src/android/net/TestNetworkManager.java
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";