Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd am: ee651a8d1a am: 11325e1594 am: a4e5f189c9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435

Change-Id: Ie842c6e82f1e532112ec6c175f0c8315ac2e54d4
This commit is contained in:
Chiachang Wang
2021-04-15 14:03:01 +00:00
committed by Automerger Merge Worker
parent 913a5d0ed2 a4e5f189c9
commit 06bb243ae6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Connectivity/framework/src/android/net/LinkProperties.java
View File

@@ -686,8 +686,8 @@ public final class LinkProperties implements Parcelable {
}
/**
* 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.