From 3e34c6d8fc2380bfc80f1d6d5ac0156991dafed1 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 11 Aug 2022 11:39:32 +0000 Subject: Revert "Invert the order of event sending and VpnRunner.exit()" This reverts commit 9cfd367413b010dd517840a9aab592b1cf77012b. Reason for revert: Change-Id: Ibdd13c67c2f7cda5331df14f0bedd4e33f8df3fa --- services/core/java/com/android/server/connectivity/Vpn.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index b85d36da9f4a..16a060af66ad 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -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); } } -- cgit v1.2.3-59-g8ed1b