diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2022-08-11 12:09:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-11 12:09:12 +0000 |
| commit | 880e944b9c9f6f8af9f52b3b262aa7727e5c091c (patch) | |
| tree | 9994e123d84e8e5f7aeb2f14ef5caaaf44f8eea0 | |
| parent | 9ccb8b939b760df049f5bc49fe36182bc6e03bb6 (diff) | |
| parent | 1660147b8466c402a749e531b00cf01925634e30 (diff) | |
| download | base-880e944b9c9f6f8af9f52b3b262aa7727e5c091c.tar.gz | |
Merge "Revert "Invert the order of event sending and VpnRunner.exit()"" am: 1660147b84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2183496
Change-Id: Iabdd1bc7277878efe22bb808394f9239acb96a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 4 |
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); } } |