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

Commit 747c0582 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:... 

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

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



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

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

        }

    }