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

Commit ce03865e authored by lucaslin's avatar lucaslin Committed by Automerger Merge Worker
Browse files

Modify javadoc for some extra values of VpnManager event am: bf3953a6 

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



Change-Id: Iaee218898f691e80cc39b74945ba9b0d9709a06f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ed65859 bf3953a6

core/java/android/net/VpnManager.java

+18 −3
Original line number Diff line number Diff line
@@ -187,14 +187,24 @@ public class VpnManager { 
    /**

     * The network that was underlying the VPN when the event occurred, as a {@link Network}.

     *

     * This extra will be null if there was no underlying network at the time of the event.

     * <p>This extra will be null if there was no underlying network at the time of the event, or

     *    the underlying network has no bearing on the event, as in the case of:

     * <ul>

     *   <li>CATEGORY_EVENT_DEACTIVATED_BY_USER

     *   <li>CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED

     * </ul>

     */

    public static final String EXTRA_UNDERLYING_NETWORK = "android.net.extra.UNDERLYING_NETWORK";



    /**

     * The {@link NetworkCapabilities} of the underlying network when the event occurred.

     *

     * This extra will be null if there was no underlying network at the time of the event.

     * <p>This extra will be null if there was no underlying network at the time of the event, or

     *    the underlying network has no bearing on the event, as in the case of:

     * <ul>

     *   <li>CATEGORY_EVENT_DEACTIVATED_BY_USER

     *   <li>CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED

     * </ul>

     */

    public static final String EXTRA_UNDERLYING_NETWORK_CAPABILITIES =

            "android.net.extra.UNDERLYING_NETWORK_CAPABILITIES";
@@ -202,7 +212,12 @@ public class VpnManager { 
    /**

     * The {@link LinkProperties} of the underlying network when the event occurred.

     *

     * This extra will be null if there was no underlying network at the time of the event.

     * <p>This extra will be null if there was no underlying network at the time of the event, or

     *    the underlying network has no bearing on the event, as in the case of:

     * <ul>

     *   <li>CATEGORY_EVENT_DEACTIVATED_BY_USER

     *   <li>CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED

     * </ul>

     */

    public static final String EXTRA_UNDERLYING_LINK_PROPERTIES =

            "android.net.extra.UNDERLYING_LINK_PROPERTIES";