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

Commit e0da2909 authored by chiachangwang's avatar chiachangwang Committed by Cherrypicker Worker
Browse files

Update the java doc to match the behavior 

The javadoc of getProvisionedVpnProfileState only describes the
VpnProfileState will be null if if there was no profile
provisioned by the calling package. The implementation requires
the VPN profile being prepared so that the owner UID and package
name are well set up. Design is either changed to refer only the
package name information and check provisioned VPN profile from
VPN profile store, or correct the javadoc. In practice, a VPN app
that provision a VPN profile without starting it should know the
VPN status which is disconnected. The API should be useful after
starting the VPN profile.

Update the doc to match the behavior.

Bug: 280021394
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:5bca5c2f0384e36e59f8a6ea433831d99ede4e69)
Merged-In: I80322ff296661972a442d799812751d5411b665b
Change-Id: I80322ff296661972a442d799812751d5411b665b
parent 878b61b0

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
@@ -5010,7 +5010,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(