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

Commit 1e12f7cb authored May 30, 2023 by Chiachang Wang Committed by Automerger Merge Worker May 30, 2023

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

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>

parents ea0a395b 26d81efc

core/java/android/net/VpnManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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() {

services/core/java/com/android/server/VpnManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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(