diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-17 13:04:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 13:04:21 +0000 |
| commit | bb6c348b0fb89d584717e8fc91a65e0eb04569e8 (patch) | |
| tree | 8ec41091d58f29e089ae53d76d4be776c85f54fe | |
| parent | 2ac7949b5774e942ac982f576ce3ac0f1e7dacd0 (diff) | |
| parent | f614cdce9d0ec2fef4a2b7ee425582db75fd4165 (diff) | |
Merge "Expose TEST_TAP_PREFIX as system API" am: f614cdce9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id27c81e87d9a67d48d6c1692438c8d09439ed080
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/TestNetworkManager.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 1fb5de3170db..fbaa93185680 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -60,6 +60,7 @@ package android.net { 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 teardownTestNetwork(@NonNull android.net.Network); + field public static final String TEST_TAP_PREFIX = "testtap"; } public final class UnderlyingNetworkInfo implements android.os.Parcelable { diff --git a/packages/Connectivity/framework/src/android/net/TestNetworkManager.java b/packages/Connectivity/framework/src/android/net/TestNetworkManager.java index 4e894143bf91..a174a7be85d1 100644 --- a/packages/Connectivity/framework/src/android/net/TestNetworkManager.java +++ b/packages/Connectivity/framework/src/android/net/TestNetworkManager.java @@ -41,7 +41,6 @@ public class TestNetworkManager { /** * Prefix for tap interfaces created by this class. - * @hide */ public static final String TEST_TAP_PREFIX = "testtap"; |