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

Commit 3e34c6d8 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Revert "Invert the order of event sending and VpnRunner.exit()" 

This reverts commit 9cfd3674.

Reason for revert: <Break test>

Change-Id: Ibdd13c67c2f7cda5331df14f0bedd4e33f8df3fa
parent 9cfd3674

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

        }

    }