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

Merge "Skip sending VpnManager events for Settings VPNs" am: 0b990180cb am: e49b2e5666 am: 2a1422a1a9 am: 03c6f064c0

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

Change-Id: I0bc432e3a41d6066c1d8303d181d9325a44a90c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Lin
2022-07-21 23:33:51 +00:00
committed by Automerger Merge Worker
parent f3020a9c06 03c6f064c0
commit 9e9244a978
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3341,7 +3341,7 @@ public class Vpn {
// TODO(b/230548427): Remove SDK check once VPN related stuff are // TODO(b/230548427): Remove SDK check once VPN related stuff are
// decoupled from ConnectivityServiceTest. // decoupled from ConnectivityServiceTest.
if (SdkLevel.isAtLeastT() && category != null) { if (SdkLevel.isAtLeastT() && category != null && isVpnApp(mPackage)) {
sendEventToVpnManagerApp(category, errorClass, errorCode, sendEventToVpnManagerApp(category, errorClass, errorCode,
getPackage(), mSessionKey, makeVpnProfileStateLocked(), getPackage(), mSessionKey, makeVpnProfileStateLocked(),
mActiveNetwork, mActiveNetwork,