Merge "Opportunistic cleanup" am: da5685428a am: 54f1300ec8

am: 4722a8680e

Change-Id: I028d82614006c21bcb3bc3a419d02237280e1939
This commit is contained in:
Chalard Jean
2019-08-28 22:22:21 -07:00
committed by android-build-merger

View File

@@ -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);