Merge "Update the java doc to match the behavior" into udc-dev am: 390e76d7a4 am: 70b6d3e384
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23471113 Change-Id: I5ee4a3d22792e7d42416bd11385d76b2a7a6ae6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user