Merge "TestNetworkManager: add note on kernel version expectation" am: 21be776580 am: 3e1f954eca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2134514
Change-Id: I70eaab11b71f01e372b3ee8764eaf1dbe290da15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/framework/src/android/net/TestNetworkManager.java b/framework/src/android/net/TestNetworkManager.java
index 7b18765..9cae9e6 100644
--- a/framework/src/android/net/TestNetworkManager.java
+++ b/framework/src/android/net/TestNetworkManager.java
@@ -236,6 +236,8 @@
/**
* Create a tap interface with or without carrier for testing purposes.
*
+ * Note: setting carrierUp = false is not supported until kernel version 5.0.
+ *
* @param carrierUp whether the created interface has a carrier or not.
* @param bringUp whether to bring up the interface before returning it.
* @hide
@@ -254,7 +256,6 @@
* Enable / disable carrier on TestNetworkInterface
*
* Note: TUNSETCARRIER is not supported until kernel version 5.0.
- * TODO: add RequiresApi annotation.
*
* @param iface the interface to configure.
* @param enabled true to turn carrier on, false to turn carrier off.