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

Commit 2b85f99d authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Opportunistic cleanup" am: da568542 am: 54f1300e am: 4722a868 

am: 7446cd21

Change-Id: Ic9a3a2eac1be002fadfc45c61437d8fd8e3415f4
parents 040b2e80 7446cd21

services/core/java/com/android/server/net/LockdownVpnTracker.java

+0 −7
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ public class LockdownVpnTracker { 
    private final PendingIntent mResetIntent;



    private String mAcceptedEgressIface;

    private String mAcceptedIface;

    private List<LinkAddress> mAcceptedSourceAddr;



    private int mErrorCount;
@@ -176,11 +174,6 @@ public class LockdownVpnTracker { 
            final String iface = vpnConfig.interfaze;

            final List<LinkAddress> sourceAddrs = vpnConfig.addresses;



            if (TextUtils.equals(iface, mAcceptedIface)

                  && sourceAddrs.equals(mAcceptedSourceAddr)) {

                return;

            }



            Slog.d(TAG, "VPN connected using iface=" + iface +

                    ", sourceAddr=" + sourceAddrs.toString());

            EventLogTags.writeLockdownVpnConnected(egressType);