From f7742a20b085d5b8cbe9879a08c78cac1443d841 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Wed, 28 Aug 2019 20:19:40 +0900 Subject: [PATCH] Opportunistic cleanup Both these members are always null. If iface is non-null, this condition is false. If iface is null, then sourceAddrs can't be null else NPE, but if it's not null it's not equals(null) so this condition is necessarily always false. Bug: None Test: FrameworksTestsNet NetworkStackTests Change-Id: Iedda059e516f1816edfe942790bc3c42d78fe748 --- .../java/com/android/server/net/LockdownVpnTracker.java | 7 ------- 1 file changed, 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 3f15b381c18b9..67a018a90f941 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 mAcceptedSourceAddr; private int mErrorCount; @@ -176,11 +174,6 @@ public class LockdownVpnTracker { final String iface = vpnConfig.interfaze; final List 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);