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

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

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



Change-Id: I19267a38d6403e02246e4e4125e21509d706efa3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8e1cd92 8f1930e6

services/core/java/com/android/server/connectivity/Vpn.java

+1 −3
Original line number Original line 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

        // To stop the VPN profile, the caller must be the current prepared package and must be

        // running an Ikev2VpnProfile.

        // running an Ikev2VpnProfile.

        if (isCurrentIkev2VpnLocked(packageName)) {

        if (isCurrentIkev2VpnLocked(packageName)) {

            // Cache ownerUid to prevent the value being changed after performing VpnRunner.exit().

            notifyVpnManagerVpnStopped(packageName, mOwnerUID);

            final int ownerUid = mOwnerUID;





            mVpnRunner.exit();

            mVpnRunner.exit();

            notifyVpnManagerVpnStopped(packageName, ownerUid);

        }

        }

    }

    }