| commit | 01d4caea3c94cfc96c36967cb5097ca073b2a2a7 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Thu Apr 15 12:46:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 15 12:46:41 2021 +0000 |
| tree | 27e5abe8e9cfa2d14b12633f740d0d2ddeeeac00 | |
| parent | b09793ab41950137361b32251ea6e14fe6a287c0 [diff] | |
| parent | 79edf2d3469a6ae3ae13923c29e4ed27cd9c10b1 [diff] |
Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd am: 79edf2d346 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435 Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d
diff --git a/framework/src/android/net/LinkProperties.java b/framework/src/android/net/LinkProperties.java index e41ed72..99f48b4 100644 --- a/framework/src/android/net/LinkProperties.java +++ b/framework/src/android/net/LinkProperties.java
@@ -686,8 +686,8 @@ } /** - * Adds a {@link RouteInfo} to this {@code LinkProperties}, if a {@link RouteInfo} - * with the same {@link RouteInfo.RouteKey} with different properties + * Adds a {@link RouteInfo} to this {@code LinkProperties}. If there is a {@link RouteInfo} + * with the same destination, gateway and interface with different properties * (e.g., different MTU), it will be updated. If the {@link RouteInfo} had an * interface name set and that differs from the interface set for this * {@code LinkProperties} an {@link IllegalArgumentException} will be thrown.