Snap for 7905862 from 97e4e16d96e9b0cb488d1fb22c40c9bcbe04baf1 to mainline-resolv-release (02b9ee44) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -68,7 +68,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"
	@@ -245,9 +245,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 +266,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 {
	@@ -339,6 +335,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 +351,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