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

Commit 1ffe8e3a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" am:... 

Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" am: 06a4f88e am: 932ee436

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

Change-Id: I02207954757c9135fbf6674720dd8e623fc9e435
parents 952ef52a 932ee436

core/java/android/net/IpSecManager.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -810,7 +810,9 @@ public final class IpSecManager { 
         *

         *

         * @param underlyingNetwork the new {@link Network} that will carry traffic for this tunnel.

         * @param underlyingNetwork the new {@link Network} that will carry traffic for this tunnel.

         *     This network MUST never be the network exposing this IpSecTunnelInterface, otherwise

         *     This network MUST never be the network exposing this IpSecTunnelInterface, otherwise

         *     this method will throw an {@link IllegalArgumentException}.

         *     this method will throw an {@link IllegalArgumentException}. If the

         *     IpSecTunnelInterface is later added to this network, all outbound traffic will be

         *     blackholed.

         */

         */

        // TODO: b/169171001 Update the documentation when transform migration is supported.

        // TODO: b/169171001 Update the documentation when transform migration is supported.

        // The purpose of making updating network and applying transforms separate is to leave open

        // The purpose of making updating network and applying transforms separate is to leave open