diff options
author | Chiachang Wang <chiachangwang@google.com> | 2022-08-11 11:44:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-08-11 11:44:07 +0000 |
commit | 1660147b8466c402a749e531b00cf01925634e30 (patch) | |
tree | 904b5f1c012fb55dbd4987ed5a20295bcd760a80 | |
parent | 6e261d7b9ad48898e30878b1d25aed8d0f2acc45 (diff) | |
parent | 3e34c6d8fc2380bfc80f1d6d5ac0156991dafed1 (diff) | |
download | base-1660147b8466c402a749e531b00cf01925634e30.tar.gz |
Merge "Revert "Invert the order of event sending and VpnRunner.exit()""
-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); } } |