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" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-06-01 07:58:41 +00:00
committed by Android (Google) Code Review
parent 29e82d2786 e0da29095c
commit 390e76d7a4
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. * Retrieve the VpnProfileState for the profile provisioned by the calling package.
* *
* @return the VpnProfileState with current information, or null if there was no profile * @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 @Nullable
public VpnProfileState getProvisionedVpnProfileState() { 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. * Retrieve the VpnProfileState for the profile provisioned by the given package.
* *
* @return the VpnProfileState with current information, or null if there was no profile * @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 * @hide
*/ */
@Override @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. * Retrieve the VpnProfileState for the profile provisioned by the given package.
* *
* @return the VpnProfileState with current information, or null if there was no profile * @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 @Nullable
public synchronized VpnProfileState getProvisionedVpnProfileState( public synchronized VpnProfileState getProvisionedVpnProfileState(