Merge "Revert "Invert the order of event sending and VpnRunner.exit()"" am: 1660147b84 am: 880e944b9c am: b0d5eeb893 am: 747c05821b am: 8f1930e64c

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

Change-Id: I19267a38d6403e02246e4e4125e21509d706efa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 1 insertions, 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);
         }
     }