Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06bb243a authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden method link in public addRoute API" am: fe09ad78 am:... 

Merge "Remove hidden method link in public addRoute API" am: fe09ad78 am: ee651a8d am: 11325e15 am: a4e5f189

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

Change-Id: Ie842c6e82f1e532112ec6c175f0c8315ac2e54d4
parents 913a5d0e a4e5f189

packages/Connectivity/framework/src/android/net/LinkProperties.java

+2 −2
Original line number Diff line number Diff line
@@ -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.