Merge "Opportunistic cleanup"

am: da5685428a Change-Id: I2bf98afc359e950572de052a1d460d58f704e36f
2019-08-28 21:55:24 -07:00
parent c53172e3f8 da5685428a
commit 54f1300ec8
1 changed files with 0 additions and 7 deletions
--- a/services/core/java/com/android/server/net/LockdownVpnTracker.java
+++ b/services/core/java/com/android/server/net/LockdownVpnTracker.java
@@ -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);