Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7742a20 authored by Chalard Jean's avatar Chalard Jean
Browse files

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
parent 66089876

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

+0 −7
Original line number Diff line number Diff line
@@ -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);