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

Commit fc25cb26 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove reference of getActiveLinkproperties" am: 79ddf1af

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

Change-Id: I8a16f71a21a9bdc2c9195a999491b9ee09b35f95
parents abed1c46 79ddf1af
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -352,7 +352,10 @@ public class VpnManagerService extends IVpnManager.Stub {
    @Override
    public void startLegacyVpn(VpnProfile profile) {
        int user = UserHandle.getUserId(mDeps.getCallingUid());
        final LinkProperties egress = mCm.getActiveLinkProperties();
        // Note that if the caller is not system (uid >= Process.FIRST_APPLICATION_UID),
        // the code might not work well since getActiveNetwork might return null if the uid is
        // blocked by NetworkPolicyManagerService.
        final LinkProperties egress = mCm.getLinkProperties(mCm.getActiveNetwork());
        if (egress == null) {
            throw new IllegalStateException("Missing active network connection");
        }