commit 747c05821bfdb226eccf5345b26c48f94a987a1c
author Chiachang Wang <chiachangwang@google.com> Thu Aug 11 13:30:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 11 13:30:55 2022 +0000
tree 933bb09d5d9439c07f3c30bccecd8a75ed87cacb
parent 9a12a0fcd47682c46e7c047b4afbfd8a46fda823
parent b0d5eeb893bf28ebe0ca41685b1697b1e872aff5

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

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

Change-Id: Ia0716f7910b69c2223a4c491d9b3bb6a5f73f8fa
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);
         }
     }