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

Commit d16b8abe authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Revert "Fix sll_protocol in DhcpClient packet socket"" 

am: 362b8c73

Change-Id: I594d7d2160313d55982b3e996d8cf538c24618bb
parents 340224b0 362b8c73

Android.bp

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

    srcs: [

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

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

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

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

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

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

        ":net-module-utils-srcs",

        ":net-module-utils-srcs",

    ],

    ],

}

}

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

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

    @Override

    public SocketAddress makePacketSocketAddress(

    public SocketAddress makePacketSocketAddress(

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

            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 Original line 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.TrafficStatsConstants;

import com.android.internal.util.WakeupMessage;

import com.android.internal.util.WakeupMessage;

import com.android.networkstack.R;

import com.android.networkstack.R;

import com.android.networkstack.apishim.SocketUtilsShimImpl;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.IOException;

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

        }





        mHwAddr = mIface.macAddr.toByteArray();

        mHwAddr = mIface.macAddr.toByteArray();

        mInterfaceBroadcastAddr = SocketUtilsShimImpl.newInstance().makePacketSocketAddress(

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

                ETH_P_IP, mIface.index, DhcpPacket.ETHER_BROADCAST);

        return true;

        return true;

    }

    }