Snap for 7915200 from 181ee419d1648ff51162518fa11173e45905dd6c to mainline-ipsec-release (d457cf23) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+7 −7

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ java_defaults {
		name: "NetworkStackShimsDefaults",
		libs: [
		"androidx.annotation_annotation",
		"networkstack-client",
		"networkstack-aidl-latest",
		],
		static_libs : [
		"modules-utils-build_system"
		@@ -215,6 +215,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",
		@@ -245,9 +247,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 +268,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 {
		@@ -339,6 +337,7 @@ android_app {
		"NetworkPermissionConfig",
		"privapp_whitelist_com.android.networkstack",
		],
		lint: { strict_updatability_linting: true },
		}

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

		cc_library_shared {

+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() {}

+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) {

+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) {

+3 −0

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

		import android.net.NetworkRequest;
		import android.os.Build;
		import android.util.Range;

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

		import com.android.networkstack.apishim.common.NetworkRequestShim;
		import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
		@@ -30,6 +32,7 @@ import java.util.Set;
		/**
		* Implementation of {@link NetworkRequestShim} for API 29.
		*/
		@RequiresApi(Build.VERSION_CODES.Q)
		public class NetworkRequestShimImpl implements NetworkRequestShim {
		protected NetworkRequestShimImpl() {}