summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Benedict Wong <benedictwong@google.com> 2020-11-20 02:31:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-20 02:31:18 +0000
commit1e01b17a63121e34cd794375bf92596abff5ac26 (patch)
tree58b38825875f099a88939a8ddf9c21c008302809
parent519f9ac56050dd4c37182a896ac2e8e06c8e8cd9 (diff)
parent0b417d78e9ce95916d1ba0c99b82804780d0daed (diff)
Merge "Expose MIN_MTU_V6 as a public, @hide constant" am: 4833cf6910 am: 919265831e am: 0b417d78e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505072 Change-Id: I0b91313fdf767e66200b61d74f7d59f5128411d2
-rw-r--r--core/java/android/net/LinkProperties.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index aa4b15454721..06046f7ded2e 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -80,8 +80,10 @@ public final class LinkProperties implements Parcelable {
private final transient boolean mParcelSensitiveFields;
private static final int MIN_MTU = 68;
- /* package-visibility - Used in other files (such as Ikev2VpnProfile) as minimum iface MTU. */
- static final int MIN_MTU_V6 = 1280;
+
+ /** @hide */
+ public static final int MIN_MTU_V6 = 1280;
+
private static final int MAX_MTU = 10000;
private static final int INET6_ADDR_LENGTH = 16;