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

Commit 70b6d3e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update the java doc to match the behavior" into udc-dev am: 390e76d7 

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



Change-Id: I5890cf7b1f0c68b7cfa8d9ee87c42e037c011bd1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66e6b0df 390e76d7

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(