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

Commit 1f8e816f authored by chiachangwang's avatar chiachangwang Committed by Automerger Merge Worker
Browse files

Stop VPN profiles by exiting VpnRunner instead of prepareInternal am:... 

Stop VPN profiles by exiting VpnRunner instead of prepareInternal am: 03f0d124 am: 5d025053 am: bc3fcb6d

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



Change-Id: I692498cde6e9f9e58a345d00cb0eb39ca4e70ac5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 906b5515 bc3fcb6d

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

+21 −14
Original line number Diff line number Diff line
@@ -1182,20 +1182,9 @@ public class Vpn { 
                cleanupVpnStateLocked();

            } else if (mVpnRunner != null) {

                if (!VpnConfig.LEGACY_VPN.equals(mPackage)) {

                    mAppOpsManager.finishOp(

                            AppOpsManager.OPSTR_ESTABLISH_VPN_MANAGER, mOwnerUID, mPackage, null);

                    // The underlying network, NetworkCapabilities and LinkProperties are not

                    // necessary to send to VPN app since the purpose of this event is to notify

                    // VPN app that VPN is deactivated by the user.

                    // TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from

                    //  ConnectivityServiceTest.

                    if (SdkLevel.isAtLeastT()) {

                        sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_DEACTIVATED_BY_USER,

                                -1 /* errorClass */, -1 /* errorCode*/, mPackage,

                                getSessionKeyLocked(), makeVpnProfileStateLocked(),

                                null /* underlyingNetwork */, null /* nc */, null /* lp */);

                    }

                    notifyVpnManagerVpnStopped(mPackage, mOwnerUID);

                }



                // cleanupVpnStateLocked() is called from mVpnRunner.exit()

                mVpnRunner.exit();

            }
@@ -4043,7 +4032,25 @@ public class Vpn { 
        // To stop the VPN profile, the caller must be the current prepared package and must be

        // running an Ikev2VpnProfile.

        if (isCurrentIkev2VpnLocked(packageName)) {

            prepareInternal(VpnConfig.LEGACY_VPN);

            notifyVpnManagerVpnStopped(packageName, mOwnerUID);



            mVpnRunner.exit();

        }

    }



    private synchronized void notifyVpnManagerVpnStopped(String packageName, int ownerUID) {

        mAppOpsManager.finishOp(

                AppOpsManager.OPSTR_ESTABLISH_VPN_MANAGER, ownerUID, packageName, null);

        // The underlying network, NetworkCapabilities and LinkProperties are not

        // necessary to send to VPN app since the purpose of this event is to notify

        // VPN app that VPN is deactivated by the user.

        // TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from

        //  ConnectivityServiceTest.

        if (SdkLevel.isAtLeastT()) {

            sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_DEACTIVATED_BY_USER,

                    -1 /* errorClass */, -1 /* errorCode*/, packageName,

                    getSessionKeyLocked(), makeVpnProfileStateLocked(),

                    null /* underlyingNetwork */, null /* nc */, null /* lp */);

        }

    }