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

Commit a4e5f189 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

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

Change-Id: I80ed5448b854960cea0ae58c93491990d54ffd86
parents 9def6bf7 11325e15

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.