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

Commit a0468497 authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

Merge "Migrate netlink-client to net-utils-device-common-netlink." am: 246ed712 am: ff87356e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1754009

Change-Id: I4f8b9761472e6ab2201c11d13f97edb987add8b8
parents 284abc17 ff87356e

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ java_defaults { 
        "androidx.annotation_annotation",

        "modules-utils-build_system",

        "netd_aidl_interface-lateststable-java",

        "netlink-client",

        "networkstack-client",

        "net-utils-framework-common",

        // See note on statsprotos when adding/updating proto build rules
@@ -224,6 +223,7 @@ java_defaults { 
        "statsprotos",

        "captiveportal-lib",

        "net-utils-device-common",

        "net-utils-device-common-netlink",

    ],

    plugins: ["java_api_finder"],

}

common/moduleutils/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ filegroup { 
        "src/android/net/ip/InterfaceController.java",

        "src/android/net/ip/IpNeighborMonitor.java",

        "src/android/net/ip/NetlinkMonitor.java",

        "src/android/net/netlink/*.java",

        "src/android/net/shared/NetdUtils.java",

        "src/android/net/shared/RouteUtils.java",

        "src/android/net/util/InterfaceParams.java",

common/moduleutils/src/android/net/ip/ConntrackMonitor.java

+5 −5
Original line number Diff line number Diff line
@@ -16,12 +16,9 @@ 


package android.net.ip;



import static android.net.netlink.ConntrackMessage.DYING_MASK;

import static android.net.netlink.ConntrackMessage.ESTABLISHED_MASK;

import static com.android.net.module.util.netlink.ConntrackMessage.DYING_MASK;

import static com.android.net.module.util.netlink.ConntrackMessage.ESTABLISHED_MASK;



import android.net.netlink.ConntrackMessage;

import android.net.netlink.NetlinkConstants;

import android.net.netlink.NetlinkMessage;

import android.net.util.SharedLog;

import android.os.Handler;

import android.system.OsConstants;
@@ -29,6 +26,9 @@ import android.system.OsConstants; 
import androidx.annotation.NonNull;



import com.android.internal.annotations.VisibleForTesting;

import com.android.net.module.util.netlink.ConntrackMessage;

import com.android.net.module.util.netlink.NetlinkConstants;

import com.android.net.module.util.netlink.NetlinkMessage;



import java.util.Objects;

common/moduleutils/src/android/net/ip/IpNeighborMonitor.java

+9 −7
Original line number Diff line number Diff line
@@ -16,22 +16,24 @@ 


package android.net.ip;



import static android.net.netlink.NetlinkConstants.RTM_DELNEIGH;

import static android.net.netlink.NetlinkConstants.hexify;

import static android.net.netlink.NetlinkConstants.stringForNlMsgType;

import static android.system.OsConstants.NETLINK_ROUTE;



import static com.android.net.module.util.netlink.NetlinkConstants.RTM_DELNEIGH;

import static com.android.net.module.util.netlink.NetlinkConstants.hexify;

import static com.android.net.module.util.netlink.NetlinkConstants.stringForNlMsgType;



import android.net.MacAddress;

import android.net.netlink.NetlinkMessage;

import android.net.netlink.NetlinkSocket;

import android.net.netlink.RtNetlinkNeighborMessage;

import android.net.netlink.StructNdMsg;

import android.net.util.SharedLog;

import android.os.Handler;

import android.system.ErrnoException;

import android.system.OsConstants;

import android.util.Log;



import com.android.net.module.util.netlink.NetlinkMessage;

import com.android.net.module.util.netlink.NetlinkSocket;

import com.android.net.module.util.netlink.RtNetlinkNeighborMessage;

import com.android.net.module.util.netlink.StructNdMsg;



import java.net.InetAddress;

import java.util.StringJoiner;

common/moduleutils/src/android/net/ip/NetlinkMonitor.java

+5 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.net.ip;



import static android.net.netlink.NetlinkConstants.hexify;

import static android.net.util.SocketUtils.makeNetlinkSocketAddress;

import static android.system.OsConstants.AF_NETLINK;

import static android.system.OsConstants.SOCK_DGRAM;
@@ -24,10 +23,9 @@ import static android.system.OsConstants.SOCK_NONBLOCK; 
import static android.system.OsConstants.SOL_SOCKET;

import static android.system.OsConstants.SO_RCVBUF;



import static com.android.net.module.util.netlink.NetlinkConstants.hexify;



import android.annotation.NonNull;

import android.net.netlink.NetlinkErrorMessage;

import android.net.netlink.NetlinkMessage;

import android.net.netlink.NetlinkSocket;

import android.net.util.SharedLog;

import android.net.util.SocketUtils;

import android.os.Handler;
@@ -37,6 +35,9 @@ import android.system.Os; 
import android.util.Log;



import com.android.net.module.util.PacketReader;

import com.android.net.module.util.netlink.NetlinkErrorMessage;

import com.android.net.module.util.netlink.NetlinkMessage;

import com.android.net.module.util.netlink.NetlinkSocket;



import java.io.FileDescriptor;

import java.io.IOException;