Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Chiachang Wang
2022-08-11 13:30:55 +00:00
committed by Automerger Merge Worker
parent 9a12a0fcd4 b0d5eeb893
commit 747c05821b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -4042,11 +4042,9 @@ public class Vpn {
// To stop the VPN profile, the caller must be the current prepared package and must be // To stop the VPN profile, the caller must be the current prepared package and must be
// running an Ikev2VpnProfile. // running an Ikev2VpnProfile.
if (isCurrentIkev2VpnLocked(packageName)) { if (isCurrentIkev2VpnLocked(packageName)) {
// Cache ownerUid to prevent the value being changed after performing VpnRunner.exit(). notifyVpnManagerVpnStopped(packageName, mOwnerUID);
final int ownerUid = mOwnerUID;
mVpnRunner.exit(); mVpnRunner.exit();
notifyVpnManagerVpnStopped(packageName, ownerUid);
} }
} }