Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify javadoc for some extra values of VpnManager event am: bf3953a627 am: 0b248c9016

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

Change-Id: If90125bbdf401a53192c9e25e43c2e54ef4e0536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
lucaslin
2022-05-12 12:49:28 +00:00
committed by Automerger Merge Worker
parent 3eec382832 0b248c9016
commit be9c7dfa18
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/net/VpnManager.java
View File

@@ -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";