summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorKen Chen <cken@google.com>2021-05-13 02:45:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-13 02:45:06 +0000
commit233682e67511e30029e68d7de24dac448a810c19 (patch)
treeefc79b0105d4101fcf5c87ec299c4ce42012ee2f /core/java
parent4be8e66448d344eddcee449fdd0ba20ca788b447 (diff)
parent3ae939569e13409000644d19b20c5b66ef581af1 (diff)
Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385 Change-Id: Id2e9d16c88088ef5d3ffe6f698af5ee8201c7716
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/VpnManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/net/VpnManager.java b/core/java/android/net/VpnManager.java
index 0d1b31cdb3fa..662ebb356f4c 100644
--- a/core/java/android/net/VpnManager.java
+++ b/core/java/android/net/VpnManager.java
@@ -58,7 +58,6 @@ import java.util.List;
* @see Ikev2VpnProfile
*/
public class VpnManager {
- // TODO: add a unit test to ensure that TYPE_VPN_xxx matches android.net.NativeVpnType.
/** Type representing a lack of VPN @hide */
@SystemApi(client = MODULE_LIBRARIES)
public static final int TYPE_VPN_NONE = -1;