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

Commit ba6166f9 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

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

Merge "Update the java doc to match the behavior" am: 26d81efc am: 1e12f7cb am: 866e0afa am: 066dae5d am: fd8a78bd am: 3c47a2db

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



Change-Id: Ic51f8f87efdafcd41ee83c7eddb7c42ea21de1d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ec00282 3c47a2db

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(