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

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

Merge "Invert the order of event sending and VpnRunner.exit()" am: 47b156d6... 

Merge "Invert the order of event sending and VpnRunner.exit()" am: 47b156d6 am: 2929e762 am: 9c7d98ab am: 9b0eebc5

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



Change-Id: Ibf0b7d93f6651d86737d0f2ba77ff78d0fb1b02b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dba18dca 9b0eebc5

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

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

            notifyVpnManagerVpnStopped(packageName, mOwnerUID);

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

            final int ownerUid = mOwnerUID;



            mVpnRunner.exit();

            notifyVpnManagerVpnStopped(packageName, ownerUid);

        }

    }