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

Merge "Invert the order of event sending and VpnRunner.exit()" am: 47b156d650

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

Change-Id: I3b728904d8e99fa1830234ba88d61fd143c2062c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2022-08-11 08:34:33 +00:00
committed by Automerger Merge Worker
parent a2ceac3f74 47b156d650
commit 2929e7629a
1 changed files with 3 additions and 1 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,9 +4042,11 @@ 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)) {
notifyVpnManagerVpnStopped(packageName, mOwnerUID); // Cache ownerUid to prevent the value being changed after performing VpnRunner.exit().
final int ownerUid = mOwnerUID;
mVpnRunner.exit(); mVpnRunner.exit();
notifyVpnManagerVpnStopped(packageName, ownerUid);
} }
} }