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

Commit 8f1930e6 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 am: 747c0582

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



Change-Id: I1dfae2af4eaa8acb42463cce91be4da025fe1942
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68bbbd9d 747c0582

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

        }

    }