summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chalard Jean <jchalard@google.com> 2019-08-28 22:29:22 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-28 22:29:22 -0700
commit2b85f99dcd433b503c5138ad8f1a1c9673595fa3 (patch)
tree326c150eac3e43c3d88b2c1fbac9844c90c5164d
parent040b2e80bafb150a736889e95d9128ac85e56b5d (diff)
parent7446cd21f116aff5f5b857965d244041ac402a06 (diff)
Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8 am: 4722a8680e
am: 7446cd21f1 Change-Id: Ic9a3a2eac1be002fadfc45c61437d8fd8e3415f4
-rw-r--r--services/core/java/com/android/server/net/LockdownVpnTracker.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java
index 3f15b381c18b..67a018a90f94 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 @@ 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);