Snap for 7923150 from 7afca1af49d8f5cd741fd7899f2c2f51b43038ee to mainline-cellbroadcast-release (2e84fee9) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+38 −11

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,17 @@ package {
	default_applicable_licenses: ["Android-Apache-2.0"],		default_applicable_licenses: ["Android-Apache-2.0"],
	}		}

			// Defaults to enable/disable java targets that depend on
			// NetworkStackNext, which uses development APIs. "enabled" may
			// have a different value depending on the branch.
			java_defaults {
			name: "NetworkStackNextEnableDefaults",
			enabled: true,
			}
			// This is a placeholder comment to avoid merge conflicts
			// as the above target may have different "enabled" values
			// depending on the branch

	java_defaults {		java_defaults {
	name: "NetworkStackDevApiLevel",		name: "NetworkStackDevApiLevel",
	min_sdk_version: "29",		min_sdk_version: "29",
	@@ -68,7 +79,7 @@ java_defaults {
	name: "NetworkStackShimsDefaults",		name: "NetworkStackShimsDefaults",
	libs: [		libs: [
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	"networkstack-client",		"networkstack-aidl-latest",
	],		],
	static_libs : [		static_libs : [
	"modules-utils-build_system"		"modules-utils-build_system"
	@@ -215,6 +226,8 @@ java_defaults {
	static_libs: [		static_libs: [
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	"modules-utils-build_system",		"modules-utils-build_system",
			"modules-utils-preconditions",
			"modules-utils-statemachine",
	"netd_aidl_interface-lateststable-java",		"netd_aidl_interface-lateststable-java",
	"networkstack-client",		"networkstack-client",
	"net-utils-framework-common",		"net-utils-framework-common",
	@@ -231,7 +244,11 @@ java_defaults {
	// The versions of the android library containing network stack code compiled for each SDK variant.		// The versions of the android library containing network stack code compiled for each SDK variant.
	android_library {		android_library {
	name: "NetworkStackApiCurrentLib",		name: "NetworkStackApiCurrentLib",
	defaults: ["NetworkStackDevApiLevel", "NetworkStackAndroidLibraryDefaults"],		defaults: [
			"NetworkStackDevApiLevel",
			"NetworkStackAndroidLibraryDefaults",
			"NetworkStackNextEnableDefaults",
			],
	srcs: [		srcs: [
	"src/*/.java",		"src/*/.java",
	":statslog-networkstack-java-gen-current"		":statslog-networkstack-java-gen-current"
	@@ -245,9 +262,7 @@ android_library {
	"//packages/modules/NetworkStack/tests/unit",		"//packages/modules/NetworkStack/tests/unit",
	"//packages/modules/NetworkStack/tests/integration",		"//packages/modules/NetworkStack/tests/integration",
	],		],
	lint: {		lint: { strict_updatability_linting: true },
	baseline_filename: "lint-baseline-current-lib.xml",
	},
	}		}

	android_library {		android_library {
	@@ -268,9 +283,7 @@ android_library {
	"//packages/modules/NetworkStack/tests/unit",		"//packages/modules/NetworkStack/tests/unit",
	"//packages/modules/NetworkStack/tests/integration",		"//packages/modules/NetworkStack/tests/integration",
	],		],
	lint: {		lint: { strict_updatability_linting: true },
	baseline_filename: "lint-baseline-stable-lib.xml",
	},
	}		}

	filegroup {		filegroup {
	@@ -304,7 +317,11 @@ java_defaults {
	// Non-updatable network stack running in the system server process for devices not using the module		// Non-updatable network stack running in the system server process for devices not using the module
	android_app {		android_app {
	name: "InProcessNetworkStack",		name: "InProcessNetworkStack",
	defaults: [ "NetworkStackAppDefaults", "NetworkStackDevApiLevel"],		defaults: [
			"NetworkStackAppDefaults",
			"NetworkStackDevApiLevel",
			"NetworkStackNextEnableDefaults",
			],
	static_libs: ["NetworkStackApiCurrentLib"],		static_libs: ["NetworkStackApiCurrentLib"],
	certificate: "platform",		certificate: "platform",
	manifest: "AndroidManifest_InProcess.xml",		manifest: "AndroidManifest_InProcess.xml",
	@@ -322,7 +339,11 @@ android_app {
	// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top		// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
	android_library {		android_library {
	name: "NetworkStackNextManifestBase",		name: "NetworkStackNextManifestBase",
	defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],		defaults: [
			"NetworkStackAppDefaults",
			"NetworkStackDevApiLevel",
			"NetworkStackNextEnableDefaults",
			],
	static_libs: ["NetworkStackApiCurrentLib"],		static_libs: ["NetworkStackApiCurrentLib"],
	manifest: "AndroidManifest.xml"		manifest: "AndroidManifest.xml"
	}		}
	@@ -330,7 +351,11 @@ android_library {
	// NetworkStack build targeting the current API release, for testing on in-development SDK		// NetworkStack build targeting the current API release, for testing on in-development SDK
	android_app {		android_app {
	name: "NetworkStackNext",		name: "NetworkStackNext",
	defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],		defaults: [
			"NetworkStackAppDefaults",
			"NetworkStackDevApiLevel",
			"NetworkStackNextEnableDefaults",
			],
	static_libs: ["NetworkStackNextManifestBase"],		static_libs: ["NetworkStackNextManifestBase"],
	certificate: "networkstack",		certificate: "networkstack",
	manifest: "AndroidManifest_Next.xml",		manifest: "AndroidManifest_Next.xml",
	@@ -339,6 +364,7 @@ android_app {
	"NetworkPermissionConfig",		"NetworkPermissionConfig",
	"privapp_whitelist_com.android.networkstack",		"privapp_whitelist_com.android.networkstack",
	],		],
			lint: { strict_updatability_linting: true },
	}		}

	// Updatable network stack for finalized API		// Updatable network stack for finalized API
	@@ -354,6 +380,7 @@ android_app {
	"privapp_whitelist_com.android.networkstack",		"privapp_whitelist_com.android.networkstack",
	],		],
	updatable: true,		updatable: true,
			lint: { strict_updatability_linting: true },
	}		}

	cc_library_shared {		cc_library_shared {

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,8 +17,10 @@
	package com.android.networkstack.apishim.api29;		package com.android.networkstack.apishim.api29;

	import android.net.Uri;		import android.net.Uri;
			import android.os.Build;

	import androidx.annotation.NonNull;		import androidx.annotation.NonNull;
			import androidx.annotation.RequiresApi;
	import androidx.annotation.VisibleForTesting;		import androidx.annotation.VisibleForTesting;

	import com.android.networkstack.apishim.common.CaptivePortalDataShim;		import com.android.networkstack.apishim.common.CaptivePortalDataShim;
	@@ -33,6 +35,7 @@ import org.json.JSONObject;
	* <p>Use {@link com.android.networkstack.apishim.CaptivePortalDataShimImpl} instead of this		* <p>Use {@link com.android.networkstack.apishim.CaptivePortalDataShimImpl} instead of this
	* fallback implementation.		* fallback implementation.
	*/		*/
			@RequiresApi(Build.VERSION_CODES.Q)
	public abstract class CaptivePortalDataShimImpl implements CaptivePortalDataShim {		public abstract class CaptivePortalDataShimImpl implements CaptivePortalDataShim {
	protected CaptivePortalDataShimImpl() {}		protected CaptivePortalDataShimImpl() {}

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

+3 −0

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

+3 −17

Original line number	Original line	Diff line number	Diff line
	@@ -20,10 +20,11 @@ import android.net.IpPrefix;
	import android.net.LinkProperties;		import android.net.LinkProperties;
	import android.net.NetworkCapabilities;		import android.net.NetworkCapabilities;
	import android.net.Uri;		import android.net.Uri;
			import android.os.Build;

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

	import com.android.networkstack.apishim.common.CaptivePortalDataShim;		import com.android.networkstack.apishim.common.CaptivePortalDataShim;
	import com.android.networkstack.apishim.common.NetworkInformationShim;		import com.android.networkstack.apishim.common.NetworkInformationShim;
	@@ -36,6 +37,7 @@ import java.net.Inet4Address;
	* <p>Use {@link com.android.networkstack.apishim.NetworkInformationShimImpl} instead of this		* <p>Use {@link com.android.networkstack.apishim.NetworkInformationShimImpl} instead of this
	* fallback implementation.		* fallback implementation.
	*/		*/
			@RequiresApi(Build.VERSION_CODES.Q)
	public class NetworkInformationShimImpl implements NetworkInformationShim {		public class NetworkInformationShimImpl implements NetworkInformationShim {
	protected NetworkInformationShimImpl() {}		protected NetworkInformationShimImpl() {}

	@@ -49,22 +51,6 @@ public class NetworkInformationShimImpl implements NetworkInformationShim {
	return new NetworkInformationShimImpl();		return new NetworkInformationShimImpl();
	}		}

	/**
	* Indicates whether the shim can use APIs above the Q SDK.
	*/
	@VisibleForTesting
	public static boolean useApiAboveQ() {
	return false;
	}

	/**
	* Indicates whether the shim can use APIs above the R SDK.
	*/
	@VisibleForTesting
	public static boolean useApiAboveR() {
	return false;
	}

	@Nullable		@Nullable
	@Override		@Override
	public Uri getCaptivePortalApiUrl(@Nullable LinkProperties lp) {		public Uri getCaptivePortalApiUrl(@Nullable LinkProperties lp) {

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

+3 −0