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

Commit 37e6cfd8 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 am: 22fefc6d

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



Change-Id: I0ef81415bd5346c87cb5bc1dcd41e299713d174e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8318d5c 22fefc6d

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

        }

    }