commit b0d5eeb893bf28ebe0ca41685b1697b1e872aff5
author Chiachang Wang <chiachangwang@google.com> Thu Aug 11 13:14:28 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 11 13:14:28 2022 +0000
tree 9d2d10f54395f7df7f6a92dc0ef59e9dc4c6221d
parent a9a2a83b29f8ad4472b47c84c3f08943b9192e9e
parent 880e944b9c9f6f8af9f52b3b262aa7727e5c091c

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

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

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

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

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index b85d36d..16a060a 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 @@
         // 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);
         }
     }