| commit | 79edf2d3469a6ae3ae13923c29e4ed27cd9c10b1 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Thu Apr 15 11:53:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 15 11:53:02 2021 +0000 |
| tree | 27e5abe8e9cfa2d14b12633f740d0d2ddeeeac00 | |
| parent | 7dc61be0da6c3e2cc191d7e2b1ac8be5981157d0 [diff] | |
| parent | 7ceeabe0daf6eaf8091f65e639496d24346e9425 [diff] |
Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435 Change-Id: Ide004783057673561ea631e0a59ce4c01c2841af
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.