Snap for 7924065 from 4b13766007f37d9b306bef456ab0a3347e48ecc1 to mainline-art-release (c082b677) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+39 −12

Original line number	Diff line number	Diff line
		@@ -45,6 +45,17 @@ package {
		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 {
		name: "NetworkStackDevApiLevel",
		min_sdk_version: "29",
		@@ -68,7 +79,7 @@ java_defaults {
		name: "NetworkStackShimsDefaults",
		libs: [
		"androidx.annotation_annotation",
		"networkstack-client",
		"networkstack-aidl-latest",
		],
		static_libs : [
		"modules-utils-build_system"
		@@ -119,7 +130,7 @@ java_library {
		sdk_version: "system_30",
		visibility: ["//visibility:private"],
		lint: {
		baseline_filename: "lint-baseline-api-30-shims.xml",
		strict_updatability_linting: true,
		},
		}

		@@ -215,6 +226,8 @@ java_defaults {
		static_libs: [
		"androidx.annotation_annotation",
		"modules-utils-build_system",
		"modules-utils-preconditions",
		"modules-utils-statemachine",
		"netd_aidl_interface-lateststable-java",
		"networkstack-client",
		"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.
		android_library {
		name: "NetworkStackApiCurrentLib",
		defaults: ["NetworkStackDevApiLevel", "NetworkStackAndroidLibraryDefaults"],
		defaults: [
		"NetworkStackDevApiLevel",
		"NetworkStackAndroidLibraryDefaults",
		"NetworkStackNextEnableDefaults",
		],
		srcs: [
		"src/*/.java",
		":statslog-networkstack-java-gen-current"
		@@ -245,9 +262,7 @@ android_library {
		"//packages/modules/NetworkStack/tests/unit",
		"//packages/modules/NetworkStack/tests/integration",
		],
		lint: {
		baseline_filename: "lint-baseline-current-lib.xml",
		},
		lint: { strict_updatability_linting: true },
		}

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

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

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

		cc_library_shared {

OWNERS

+2 −8

Original line number	Diff line number	Diff line
		codewiz@google.com
		jchalard@google.com
		junyulai@google.com
		lorenzo@google.com
		maze@google.com
		reminv@google.com
		satk@google.com
		xiaom@google.com
		set noparent
		file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking

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

+3 −0

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

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

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

		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
		* fallback implementation.
		*/
		@RequiresApi(Build.VERSION_CODES.Q)
		public abstract class CaptivePortalDataShimImpl implements CaptivePortalDataShim {
		protected CaptivePortalDataShimImpl() {}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -25,9 +25,11 @@ import android.net.ConnectivityManager;
		import android.net.ConnectivityManager.NetworkCallback;
		import android.net.NetworkCapabilities;
		import android.net.NetworkRequest;
		import android.os.Build;
		import android.os.Handler;

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

		import com.android.networkstack.apishim.common.ConnectivityManagerShim;
		import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
		@@ -35,6 +37,7 @@ import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
		/**
		* Implementation of {@link ConnectivityManagerShim} for API 29.
		*/
		@RequiresApi(Build.VERSION_CODES.Q)
		public class ConnectivityManagerShimImpl implements ConnectivityManagerShim {
		protected final ConnectivityManager mCm;
		protected ConnectivityManagerShimImpl(Context context) {

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

+3 −17

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

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

		@@ -49,22 +51,6 @@ public class NetworkInformationShimImpl implements NetworkInformationShim {
		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
		@Override
		public Uri getCaptivePortalApiUrl(@Nullable LinkProperties lp) {