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

Commit 15e98f71 authored by Paul Hu's avatar Paul Hu Committed by android-build-merger
Browse files

Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am:... 

Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am: f9d61f1c6d am: 96f34c3151
am: bf3e6f5e75

Change-Id: I599dcdb2312a3e1bb1de8e03f349df207c7cc075
parents 8e0423ad fa0cf3d9

src/android/net/ip/IpClient.java

+2 −2
Original line number Diff line number Diff line
@@ -1389,8 +1389,8 @@ public class IpClient extends StateMachine { 
            apfConfig.apfCapabilities = mConfiguration.mApfCapabilities;

            apfConfig.multicastFilter = mMulticastFiltering;

            // Get the Configuration for ApfFilter from Context

            apfConfig.ieee802_3Filter = ApfCapabilities.getApfDrop8023Frames(mContext);

            apfConfig.ethTypeBlackList = ApfCapabilities.getApfEthTypeBlackList(mContext);

            apfConfig.ieee802_3Filter = ApfCapabilities.getApfDrop8023Frames();

            apfConfig.ethTypeBlackList = ApfCapabilities.getApfEtherTypeBlackList();

            mApfFilter = ApfFilter.maybeCreate(mContext, apfConfig, mInterfaceParams, mCallback);

            // TODO: investigate the effects of any multicast filtering racing/interfering with the

            // rest of this IP configuration startup.