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

Commit 9b0eebc5 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

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



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

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);

        }

    }