Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e9244a9 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Skip sending VpnManager events for Settings VPNs" am: 0b990180 am:... 

Merge "Skip sending VpnManager events for Settings VPNs" am: 0b990180 am: e49b2e56 am: 2a1422a1 am: 03c6f064

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



Change-Id: I0bc432e3a41d6066c1d8303d181d9325a44a90c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3020a9c 03c6f064

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1
Original line number Diff line number Diff line
@@ -3341,7 +3341,7 @@ public class Vpn { 


                // TODO(b/230548427): Remove SDK check once VPN related stuff are

                //  decoupled from ConnectivityServiceTest.

                if (SdkLevel.isAtLeastT() && category != null) {

                if (SdkLevel.isAtLeastT() && category != null && isVpnApp(mPackage)) {

                    sendEventToVpnManagerApp(category, errorClass, errorCode,

                            getPackage(), mSessionKey, makeVpnProfileStateLocked(),

                            mActiveNetwork,