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

Merge "Update the java doc to match the behavior" am: 26d81efcc5

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

Change-Id: I7ff177e53ab7f02c219a982c3fee9e5deaaccfdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-05-30 07:24:32 +00:00
committed by Automerger Merge Worker
parent ea0a395bec 26d81efcc5
commit 1e12f7cb8c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,7 +444,7 @@ public class VpnManager {
* Retrieve the VpnProfileState for the profile provisioned by the calling package.
*
* @return the VpnProfileState with current information, or null if there was no profile
* provisioned by the calling package.
* provisioned and started by the calling package.
*/
@Nullable
public VpnProfileState getProvisionedVpnProfileState() {

2
services/core/java/com/android/server/VpnManagerService.java
View File

@@ -406,7 +406,7 @@ public class VpnManagerService extends IVpnManager.Stub {
* Retrieve the VpnProfileState for the profile provisioned by the given package.
*
* @return the VpnProfileState with current information, or null if there was no profile
* provisioned by the given package.
* provisioned and started by the given package.
* @hide
*/
@Override

2
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -5012,7 +5012,7 @@ public class Vpn {
* Retrieve the VpnProfileState for the profile provisioned by the given package.
*
* @return the VpnProfileState with current information, or null if there was no profile
* provisioned by the given package.
* provisioned and started by the given package.
*/
@Nullable
public synchronized VpnProfileState getProvisionedVpnProfileState(