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

Commit f0717143 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev

parents def2536a c628adc6

Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ java_defaults { 
        "netd_aidl_interface-java",

        "netd_aidl_interface-java",

        "netlink-client",

        "netlink-client",

        "networkstack-client",

        "networkstack-client",

        "net-utils-framework-common",

        "datastallprotosnano",

        "datastallprotosnano",

        "statsprotos",

        "statsprotos",

        "captiveportal-lib",

        "captiveportal-lib",

jarjar-rules-shared.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -3,8 +3,8 @@ rule com.android.net.module.util.** com.android.networkstack.util.@1 




rule com.android.internal.util.** android.net.networkstack.util.@1

rule com.android.internal.util.** android.net.networkstack.util.@1





rule android.net.shared.Inet4AddressUtils* android.net.networkstack.shared.Inet4AddressUtils@1

# Classes from net-utils-framework-common

rule android.net.shared.InetAddressUtils* android.net.networkstack.shared.InetAddressUtils@1

rule com.android.net.module.util.** com.android.networkstack.util.@1





# Ignore DhcpResultsParcelable, but jarjar DhcpResults

# Ignore DhcpResultsParcelable, but jarjar DhcpResults

# TODO: move DhcpResults into services.net and delete from here

# TODO: move DhcpResults into services.net and delete from here

src/android/net/dhcp/DhcpLease.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




package android.net.dhcp;

package android.net.dhcp;





import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTH;

import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTH;





import android.net.MacAddress;

import android.net.MacAddress;

import android.os.SystemClock;

import android.os.SystemClock;

src/android/net/dhcp/DhcpLeaseRepository.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,10 +18,10 @@ package android.net.dhcp; 




import static android.net.dhcp.DhcpLease.EXPIRATION_NEVER;

import static android.net.dhcp.DhcpLease.EXPIRATION_NEVER;

import static android.net.dhcp.DhcpLease.inet4AddrToString;

import static android.net.dhcp.DhcpLease.inet4AddrToString;

import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTH;

import static android.net.shared.Inet4AddressUtils.intToInet4AddressHTH;

import static android.net.shared.Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH;





import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTH;

import static com.android.net.module.util.Inet4AddressUtils.intToInet4AddressHTH;

import static com.android.net.module.util.Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_BITS;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_BITS;

src/android/net/dhcp/DhcpPacket.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY; 
import android.net.DhcpResults;

import android.net.DhcpResults;

import android.net.LinkAddress;

import android.net.LinkAddress;

import android.net.metrics.DhcpErrorEvent;

import android.net.metrics.DhcpErrorEvent;

import android.net.shared.Inet4AddressUtils;

import android.os.Build;

import android.os.Build;

import android.os.SystemProperties;

import android.os.SystemProperties;

import android.system.OsConstants;

import android.system.OsConstants;
@@ -31,6 +30,7 @@ import android.text.TextUtils; 
import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;





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

import com.android.networkstack.apishim.common.ShimUtils;

import com.android.networkstack.apishim.common.ShimUtils;





import java.io.UnsupportedEncodingException;

import java.io.UnsupportedEncodingException;