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

Commit 5ad0944d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Revert "Fix sll_protocol in DhcpClient packet socket" 

This reverts commit 0c5e7400.

Reason for revert: Broke build in qt-qpr1-dev-plus-aosp

Change-Id: I2e5738e776881f8c4f3cf459398a250560a43559
parent 0c5e7400

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ filegroup { 
    srcs: [

        "apishim/common/**/*.java",

        "apishim/29/**/*.java",

        "apishim/30/**/*.java",

        "apishim/current/**/*.java",

        ":net-module-utils-srcs",

    ],

}

apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class SocketUtilsShimImpl 
    @Override

    public SocketAddress makePacketSocketAddress(

            int protocol, int ifIndex, @NonNull byte[] hwAddr) {

        return SocketUtils.makePacketSocketAddress(protocol, ifIndex, hwAddr);

        // TODO: use new API (which takes protocol, ifIndex, hwAddr) once implemented

        return SocketUtils.makePacketSocketAddress(ifIndex, hwAddr);

    }

}

src/android/net/dhcp/DhcpClient.java

+1 −3
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ import com.android.internal.util.StateMachine; 
import com.android.internal.util.TrafficStatsConstants;

import com.android.internal.util.WakeupMessage;

import com.android.networkstack.R;

import com.android.networkstack.apishim.SocketUtilsShimImpl;



import java.io.FileDescriptor;

import java.io.IOException;
@@ -390,8 +389,7 @@ public class DhcpClient extends StateMachine { 
        }



        mHwAddr = mIface.macAddr.toByteArray();

        mInterfaceBroadcastAddr = SocketUtilsShimImpl.newInstance().makePacketSocketAddress(

                ETH_P_IP, mIface.index, DhcpPacket.ETHER_BROADCAST);

        mInterfaceBroadcastAddr = makePacketSocketAddress(mIface.index, DhcpPacket.ETHER_BROADCAST);

        return true;

    }