commit 54f1300ec8ff0d707505035f3b3b1903325b228b
author Chalard Jean <jchalard@google.com> Wed Aug 28 21:55:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 21:55:24 2019 -0700
tree 11068b793e43891c09b99f2adcaf6f09ef4dec10
parent c53172e3f86271582e698a3d3ae37de3e83949a9
parent da5685428a6a1a6e74b7d76fa8566ab706dded10

Merge "Opportunistic cleanup"
am: da5685428a

Change-Id: I2bf98afc359e950572de052a1d460d58f704e36f

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

diff --git a/services/core/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java
index 3f15b38..67a018a 100644
--- a/services/core/java/com/android/server/net/LockdownVpnTracker.java
+++ b/services/core/java/com/android/server/net/LockdownVpnTracker.java
@@ -77,8 +77,6 @@
     private final PendingIntent mResetIntent;
 
     private String mAcceptedEgressIface;
-    private String mAcceptedIface;
-    private List<LinkAddress> mAcceptedSourceAddr;
 
     private int mErrorCount;
 
@@ -176,11 +174,6 @@
             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);