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

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

Merge "Revert "Invert the order of event sending and VpnRunner.exit()"" am: 1660147b 

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



Change-Id: Iabdd1bc7277878efe22bb808394f9239acb96a9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ccb8b93 1660147b

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

+1 −3
Original line number Diff line number Diff line
@@ -4042,11 +4042,9 @@ 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)) {

            // Cache ownerUid to prevent the value being changed after performing VpnRunner.exit().

            final int ownerUid = mOwnerUID;

            notifyVpnManagerVpnStopped(packageName, mOwnerUID);



            mVpnRunner.exit();

            notifyVpnManagerVpnStopped(packageName, ownerUid);

        }

    }