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

Commit 11325e15 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: ee651a8d 

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

Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d
parents 7f37bd67 ee651a8d

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

+2 −2
Original line number Original line 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}

     * Adds a {@link RouteInfo} to this {@code LinkProperties}. If there is a {@link RouteInfo}

     * with the same {@link RouteInfo.RouteKey} with different properties

     * with the same destination, gateway and interface with different properties

     * (e.g., different MTU), it will be updated. If the {@link RouteInfo} had an

     * (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

     * interface name set and that differs from the interface set for this

     * {@code LinkProperties} an {@link IllegalArgumentException} will be thrown.

     * {@code LinkProperties} an {@link IllegalArgumentException} will be thrown.