Snap for 6449986 from 2e16ff33e97bdbf9f7a30807c740860a1b5f147e to rvc-release (709d5f95) · Commits · e / os / android_packages_modules_NetworkStack

apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -34,11 +34,4 @@ public class ConstantsShim {
		// Constants defined in android.net.ConnectivityDiagnosticsManager.
		public static final int DETECTION_METHOD_DNS_EVENTS = 1;
		public static final int DETECTION_METHOD_TCP_METRICS = 2;
		public static final String KEY_DNS_CONSECUTIVE_TIMEOUTS = "dnsConsecutiveTimeouts";
		public static final String KEY_NETWORK_PROBES_ATTEMPTED_BITMASK = "networkProbesAttempted";
		public static final String KEY_NETWORK_PROBES_SUCCEEDED_BITMASK = "networkProbesSucceeded";
		public static final String KEY_NETWORK_VALIDATION_RESULT = "networkValidationResult";
		public static final String KEY_TCP_METRICS_COLLECTION_PERIOD_MILLIS =
		"tcpMetricsCollectionPeriodMillis";
		public static final String KEY_TCP_PACKET_FAIL_RATE = "tcpPacketFailRate";
		}

+0 −12

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.networkstack.apishim;

		import static android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
		import static android.net.ConnectivityDiagnosticsManager.DataStallReport;

		import androidx.annotation.VisibleForTesting;
		@@ -38,15 +37,4 @@ public class ConstantsShim extends com.android.networkstack.apishim.api29.Consta
		DataStallReport.DETECTION_METHOD_DNS_EVENTS;
		public static final int DETECTION_METHOD_TCP_METRICS =
		DataStallReport.DETECTION_METHOD_TCP_METRICS;
		public static final String KEY_DNS_CONSECUTIVE_TIMEOUTS =
		DataStallReport.KEY_DNS_CONSECUTIVE_TIMEOUTS;
		public static final String KEY_NETWORK_PROBES_ATTEMPTED_BITMASK =
		ConnectivityReport.KEY_NETWORK_PROBES_ATTEMPTED_BITMASK;
		public static final String KEY_NETWORK_PROBES_SUCCEEDED_BITMASK =
		ConnectivityReport.KEY_NETWORK_PROBES_SUCCEEDED_BITMASK;
		public static final String KEY_NETWORK_VALIDATION_RESULT =
		ConnectivityReport.KEY_NETWORK_VALIDATION_RESULT;
		public static final String KEY_TCP_METRICS_COLLECTION_PERIOD_MILLIS =
		DataStallReport.KEY_TCP_METRICS_COLLECTION_PERIOD_MILLIS;
		public static final String KEY_TCP_PACKET_FAIL_RATE = DataStallReport.KEY_TCP_PACKET_FAIL_RATE;
		}

+9 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.system.OsConstants;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.annotation.VisibleForTesting;

		import java.io.FileDescriptor;
		import java.io.IOException;
		@@ -92,6 +93,12 @@ public abstract class FdEventsReader<BufferType> {
		mBuffer = buffer;
		}

		@VisibleForTesting
		@NonNull
		protected MessageQueue getMessageQueue() {
		return mQueue;
		}

		/** Start this FdEventsReader. */
		public boolean start() {
		if (!onCorrectThread()) {
		@@ -185,7 +192,7 @@ public abstract class FdEventsReader<BufferType> {

		if (mFd == null) return false;

		mQueue.addOnFileDescriptorEventListener(
		getMessageQueue().addOnFileDescriptorEventListener(
		mFd,
		FD_EVENTS,
		(fd, events) -> {
		@@ -247,7 +254,7 @@ public abstract class FdEventsReader<BufferType> {
		private void unregisterAndDestroyFd() {
		if (mFd == null) return;

		mQueue.removeOnFileDescriptorEventListener(mFd);
		getMessageQueue().removeOnFileDescriptorEventListener(mFd);
		closeFd(mFd);
		mFd = null;
		onStop();

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ aidl_interface {
		"frameworks/base/wifi/aidl-export", // For wifi parcelables.
		],
		srcs: [
		"src/android/net/DataStallReportParcelable.aidl",
		"src/android/net/DhcpResultsParcelable.aidl",
		"src/android/net/INetworkMonitor.aidl",
		"src/android/net/INetworkMonitorCallbacks.aidl",
		@@ -68,6 +69,7 @@ aidl_interface {
		"src/android/net/Layer2InformationParcelable.aidl",
		"src/android/net/Layer2PacketParcelable.aidl",
		"src/android/net/NattKeepalivePacketDataParcelable.aidl",
		"src/android/net/NetworkTestResultParcelable.aidl",
		"src/android/net/PrivateDnsConfigParcel.aidl",
		"src/android/net/ProvisioningConfigurationParcelable.aidl",
		"src/android/net/ScanResultInfoParcelable.aidl",

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;
		}