Snap for 6453963 from 76e2b1e7b9ac41346698fc65228ce81f8ad804af to rvc-release (355a9743) · Commits · e / os / android_packages_modules_NetworkStack

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

+17 −13

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ public class NetlinkMonitor extends PacketReader {
		byteBuffer.order(ByteOrder.nativeOrder());

		while (byteBuffer.remaining() > 0) {
		try {
		final int position = byteBuffer.position();
		final NetlinkMessage nlMsg = NetlinkMessage.parse(byteBuffer);
		if (nlMsg == null \|\| nlMsg.getHeader() == null) {
		@@ -120,6 +121,9 @@ public class NetlinkMonitor extends PacketReader {
		}

		processNetlinkMessage(nlMsg, whenMs);
		} catch (Exception e) {
		mLog.e("Error handling netlink message", e);
		}
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.os.Looper;
		import android.os.MessageQueue;
		import android.system.ErrnoException;
		import android.system.OsConstants;
		import android.util.Log;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		@@ -244,7 +245,7 @@ public abstract class FdEventsReader<BufferType> {
		handlePacket(mBuffer, bytesRead);
		} catch (Exception e) {
		logError("handlePacket error: ", e);
		break;
		Log.wtf(FdEventsReader.class.getSimpleName(), "Error handling packet", e);
		}
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ aidl_interface {
		"5",
		],
		visibility: [
		"//system/tools/aidl/build"
		"//system/tools/aidl/build",
		],
		}

		@@ -97,11 +97,12 @@ aidl_interface {
		"3",
		"4",
		"5",
		"6",
		],
		// TODO: have tethering depend on networkstack-client and set visibility to private
		visibility: [
		"//system/tools/aidl/build",
		"//frameworks/base/packages/Tethering"
		"//frameworks/base/packages/Tethering",
		],
		}

		@@ -123,5 +124,5 @@ java_library {
		"//frameworks/base/services/net",
		"//frameworks/opt/net/wifi/service",
		"//packages/modules/NetworkStack",
		]
		],
		}

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		a3d1d41c172015deec4d05d66926b90fd8b38b64

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL interface (or parcelable). Do not try to
		// edit this file. It looks like you are doing that because you have modified
		// an AIDL interface in a backward-incompatible way, e.g., deleting a function
		// from an interface or a field from a parcelable and it broke the build. That
		// breakage is intended.
		//
		// You must not make a backward incompatible changes to the AIDL files built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.net;
		parcelable DataStallReportParcelable {
		long timestampMillis = 0;
		int detectionMethod = 1;
		int tcpPacketFailRate = 2;
		int tcpMetricsCollectionPeriodMillis = 3;
		int dnsConsecutiveTimeouts = 4;
		}