Merge changes from topic "refactor_prov_mode" am: be631ce464 am: a199351947 am: 35990085df (5887845c) · Commits · e / os / android_packages_modules_NetworkStack

common/networkstackclient/Android.bp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -134,6 +134,7 @@ aidl_interface {
	"9",		"9",
	"10",		"10",
	"11",		"11",
			"12",
	],		],
	// TODO: have tethering depend on networkstack-client and set visibility to private		// TODO: have tethering depend on networkstack-client and set visibility to private
	visibility: [		visibility: [
	@@ -165,7 +166,7 @@ java_library {
	],		],
	static_libs: [		static_libs: [
	"ipmemorystore-aidl-interfaces-V10-java",		"ipmemorystore-aidl-interfaces-V10-java",
	"networkstack-aidl-interfaces-V11-java",		"networkstack-aidl-interfaces-V12-java",
	],		],
	visibility: [		visibility: [
	"//frameworks/base/packages/Connectivity/service",		"//frameworks/base/packages/Connectivity/service",

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/12/.hash

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			ca534b24b8f1e946a36977f391a156016ea7ef4a

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/12/android/net/DataStallReportParcelable.aidl

0 → 100644

+42 −0

Original line number	Original line	Diff line number	Diff line
			/**
			* Copyright (c) 2020, The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing perNmissions and
			* limitations under the License.
			*/
			///////////////////////////////////////////////////////////////////////////////
			// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
			///////////////////////////////////////////////////////////////////////////////

			// This file is a snapshot of an AIDL file. Do not edit it manually. There are
			// two cases:
			// 1). this is a frozen version file - do not edit this in any case.
			// 2). this is a 'current' file. If you make a backwards compatible change to
			// the interface (from the latest frozen version), the build system will
			// prompt you to update this file with `m <name>-update-api`.
			//
			// You must not make a backward incompatible change to any AIDL file 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;
			@JavaDerive(toString=true)
			parcelable DataStallReportParcelable {
			long timestampMillis = 0;
			int detectionMethod = 1;
			int tcpPacketFailRate = 2;
			int tcpMetricsCollectionPeriodMillis = 3;
			int dnsConsecutiveTimeouts = 4;
			}

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/12/android/net/DhcpResultsParcelable.aidl

0 → 100644

+44 −0

Original line number	Original line	Diff line number	Diff line
			/**
			* Copyright (c) 2019, The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing perNmissions and
			* limitations under the License.
			*/
			///////////////////////////////////////////////////////////////////////////////
			// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
			///////////////////////////////////////////////////////////////////////////////

			// This file is a snapshot of an AIDL file. Do not edit it manually. There are
			// two cases:
			// 1). this is a frozen version file - do not edit this in any case.
			// 2). this is a 'current' file. If you make a backwards compatible change to
			// the interface (from the latest frozen version), the build system will
			// prompt you to update this file with `m <name>-update-api`.
			//
			// You must not make a backward incompatible change to any AIDL file 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;
			@JavaDerive(toString=true)
			parcelable DhcpResultsParcelable {
			android.net.StaticIpConfiguration baseConfiguration;
			int leaseDuration;
			int mtu;
			String serverAddress;
			String vendorInfo;
			@nullable String serverHostName;
			@nullable String captivePortalApiUrl;
			}

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/12/android/net/INetworkMonitor.aidl

0 → 100644

+59 −0

Original line number	Original line	Diff line number	Diff line
			/**
			* Copyright (c) 2018, The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing perNmissions and
			* limitations under the License.
			*/
			///////////////////////////////////////////////////////////////////////////////
			// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
			///////////////////////////////////////////////////////////////////////////////

			// This file is a snapshot of an AIDL file. Do not edit it manually. There are
			// two cases:
			// 1). this is a frozen version file - do not edit this in any case.
			// 2). this is a 'current' file. If you make a backwards compatible change to
			// the interface (from the latest frozen version), the build system will
			// prompt you to update this file with `m <name>-update-api`.
			//
			// You must not make a backward incompatible change to any AIDL file 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;
			/* @hide */
			interface INetworkMonitor {
			oneway void start();
			oneway void launchCaptivePortalApp();
			oneway void notifyCaptivePortalAppFinished(int response);
			oneway void setAcceptPartialConnectivity();
			oneway void forceReevaluation(int uid);
			oneway void notifyPrivateDnsChanged(in android.net.PrivateDnsConfigParcel config);
			oneway void notifyDnsResponse(int returnCode);
			oneway void notifyNetworkConnected(in android.net.LinkProperties lp, in android.net.NetworkCapabilities nc);
			oneway void notifyNetworkDisconnected();
			oneway void notifyLinkPropertiesChanged(in android.net.LinkProperties lp);
			oneway void notifyNetworkCapabilitiesChanged(in android.net.NetworkCapabilities nc);
			const int NETWORK_TEST_RESULT_VALID = 0;
			const int NETWORK_TEST_RESULT_INVALID = 1;
			const int NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY = 2;
			const int NETWORK_VALIDATION_RESULT_VALID = 1;
			const int NETWORK_VALIDATION_RESULT_PARTIAL = 2;
			const int NETWORK_VALIDATION_RESULT_SKIPPED = 4;
			const int NETWORK_VALIDATION_PROBE_DNS = 4;
			const int NETWORK_VALIDATION_PROBE_HTTP = 8;
			const int NETWORK_VALIDATION_PROBE_HTTPS = 16;
			const int NETWORK_VALIDATION_PROBE_FALLBACK = 32;
			const int NETWORK_VALIDATION_PROBE_PRIVDNS = 64;
			}