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

This project is archived. Its data is read-only.

Commit 48f328d1 authored Oct 14, 2020 by android-build-team Robot

Snap for 6903824 from d34cd9a1 to sc-d1-release

Change-Id: Idfdb09b629871e4ab5e4e4b21791a57738f02d0c

parents 84695642 d34cd9a1

src/android/net/apf/ApfFilter.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -27,11 +27,11 @@ import static android.system.OsConstants.IPPROTO_TCP;
	import static android.system.OsConstants.IPPROTO_UDP;		import static android.system.OsConstants.IPPROTO_UDP;
	import static android.system.OsConstants.SOCK_RAW;		import static android.system.OsConstants.SOCK_RAW;

	import static com.android.server.util.NetworkStackConstants.ICMPV6_ECHO_REQUEST_TYPE;		import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ECHO_REQUEST_TYPE;
	import static com.android.server.util.NetworkStackConstants.ICMPV6_NEIGHBOR_ADVERTISEMENT;		import static com.android.net.module.util.NetworkStackConstants.ICMPV6_NEIGHBOR_ADVERTISEMENT;
	import static com.android.server.util.NetworkStackConstants.ICMPV6_ROUTER_ADVERTISEMENT;		import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ROUTER_ADVERTISEMENT;
	import static com.android.server.util.NetworkStackConstants.ICMPV6_ROUTER_SOLICITATION;		import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ROUTER_SOLICITATION;
	import static com.android.server.util.NetworkStackConstants.IPV6_ADDR_LEN;		import static com.android.net.module.util.NetworkStackConstants.IPV6_ADDR_LEN;

	import android.content.BroadcastReceiver;		import android.content.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;

src/android/net/dhcp/DhcpClient.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -51,11 +51,11 @@ import static android.system.OsConstants.SO_BROADCAST;
	import static android.system.OsConstants.SO_RCVBUF;		import static android.system.OsConstants.SO_RCVBUF;
	import static android.system.OsConstants.SO_REUSEADDR;		import static android.system.OsConstants.SO_REUSEADDR;

	import static com.android.server.util.NetworkStackConstants.ARP_REQUEST;		import static com.android.net.module.util.NetworkStackConstants.ARP_REQUEST;
	import static com.android.server.util.NetworkStackConstants.ETHER_ADDR_LEN;		import static com.android.net.module.util.NetworkStackConstants.ETHER_ADDR_LEN;
	import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;		import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;
	import static com.android.server.util.NetworkStackConstants.IPV4_CONFLICT_ANNOUNCE_NUM;		import static com.android.net.module.util.NetworkStackConstants.IPV4_CONFLICT_ANNOUNCE_NUM;
	import static com.android.server.util.NetworkStackConstants.IPV4_CONFLICT_PROBE_NUM;		import static com.android.net.module.util.NetworkStackConstants.IPV4_CONFLICT_PROBE_NUM;

	import android.content.Context;		import android.content.Context;
	import android.net.DhcpResults;		import android.net.DhcpResults;

src/android/net/dhcp/DhcpLeaseRepository.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,8 @@ import static android.net.dhcp.DhcpLease.inet4AddrToString;
	import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTH;		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.intToInet4AddressHTH;
	import static com.android.net.module.util.Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH;		import static com.android.net.module.util.Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH;
	import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;		import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;
	import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_BITS;		import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_BITS;

	import static java.lang.Math.min;		import static java.lang.Math.min;

src/android/net/dhcp/DhcpPacket.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,8 @@

	package android.net.dhcp;		package android.net.dhcp;

	import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ALL;		import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ALL;
	import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;		import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;

	import android.net.DhcpResults;		import android.net.DhcpResults;
	import android.net.LinkAddress;		import android.net.LinkAddress;

src/android/net/dhcp/DhcpServer.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -36,9 +36,9 @@ import static android.system.OsConstants.SO_REUSEADDR;
	import static com.android.internal.util.TrafficStatsConstants.TAG_SYSTEM_DHCP_SERVER;		import static com.android.internal.util.TrafficStatsConstants.TAG_SYSTEM_DHCP_SERVER;
	import static com.android.net.module.util.Inet4AddressUtils.getBroadcastAddress;		import static com.android.net.module.util.Inet4AddressUtils.getBroadcastAddress;
	import static com.android.net.module.util.Inet4AddressUtils.getPrefixMaskAsInet4Address;		import static com.android.net.module.util.Inet4AddressUtils.getPrefixMaskAsInet4Address;
	import static com.android.server.util.NetworkStackConstants.INFINITE_LEASE;		import static com.android.net.module.util.NetworkStackConstants.INFINITE_LEASE;
	import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ALL;		import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ALL;
	import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;		import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;
	import static com.android.server.util.PermissionUtil.enforceNetworkStackCallingPermission;		import static com.android.server.util.PermissionUtil.enforceNetworkStackCallingPermission;

	import static java.lang.Integer.toUnsignedLong;		import static java.lang.Integer.toUnsignedLong;