Snap for 7379675 from d63c13775b2042940a6dfafcb693f62be15599c2 to mainline-wifi-release (2ea95749) · Commits · e / os / android_packages_modules_NetworkStack

.gitignore

0 → 100644

+7 −0

Original line number	Original line	Diff line number	Diff line
			# Generated build files
			gen/com/android/networkstack/**

			# IntelliJ project files
			**/.idea
			*/.iml
			*/.ipr

Android.bp

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -69,6 +69,9 @@ java_defaults {
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	"networkstack-client",		"networkstack-client",
	],		],
			static_libs : [
			"modules-utils-build_system"
			],
	apex_available: [		apex_available: [
	"com.android.tethering",		"com.android.tethering",
	"//apex_available:platform", // For InProcessNetworkStack and InProcessTethering		"//apex_available:platform", // For InProcessNetworkStack and InProcessTethering
	@@ -114,6 +117,9 @@ java_library {
	],		],
	sdk_version: "system_30",		sdk_version: "system_30",
	visibility: ["//visibility:private"],		visibility: ["//visibility:private"],
			lint: {
			baseline_filename: "lint-baseline-api-30-shims.xml",
			},
	}		}

	// Shims for APIs being added to the current development version of Android. These APIs are not		// Shims for APIs being added to the current development version of Android. These APIs are not
	@@ -217,6 +223,9 @@ android_library {
	"//packages/modules/NetworkStack/tests/unit",		"//packages/modules/NetworkStack/tests/unit",
	"//packages/modules/NetworkStack/tests/integration",		"//packages/modules/NetworkStack/tests/integration",
	],		],
			lint: {
			baseline_filename: "lint-baseline-current-lib.xml",
			},
	}		}

	android_library {		android_library {
	@@ -229,12 +238,17 @@ android_library {
	static_libs: ["NetworkStackApiStableShims"],		static_libs: ["NetworkStackApiStableShims"],
	manifest: "AndroidManifestBase.xml",		manifest: "AndroidManifestBase.xml",
	visibility: [		visibility: [
			"//frameworks/base/packages/Connectivity/tests/integration",
	"//frameworks/base/tests/net/integration",		"//frameworks/base/tests/net/integration",
	"//packages/modules/Connectivity/Tethering/tests/integration",		"//packages/modules/Connectivity/Tethering/tests/integration",
	"//packages/modules/Connectivity/tests/cts/net",		"//packages/modules/Connectivity/tests/cts/net",
			"//packages/modules/Connectivity/tests/integration",
	"//packages/modules/NetworkStack/tests/unit",		"//packages/modules/NetworkStack/tests/unit",
	"//packages/modules/NetworkStack/tests/integration",		"//packages/modules/NetworkStack/tests/integration",
	],		],
			lint: {
			baseline_filename: "lint-baseline-stable-lib.xml",
			},
	}		}

	filegroup {		filegroup {

OWNERS

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,5 +2,7 @@ codewiz@google.com
	jchalard@google.com		jchalard@google.com
	junyulai@google.com		junyulai@google.com
	lorenzo@google.com		lorenzo@google.com
			maze@google.com
	reminv@google.com		reminv@google.com
	satk@google.com		satk@google.com
			xiaom@google.com

TEST_MAPPING

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -5,14 +5,14 @@
	},		},
	{		{
	"name": "NetworkStackNextTests"		"name": "NetworkStackNextTests"
			},
			{
			"name": "NetworkStackIntegrationTests"
	}		}
	],		],
	"postsubmit": [		"postsubmit": [
	{		{
	"name": "NetworkStackHostTests"		"name": "NetworkStackHostTests"
	},
	{
	"name": "NetworkStackIntegrationTests"
	}		}
	],		],
	"auto-postsubmit": [		"auto-postsubmit": [
	@@ -43,6 +43,11 @@
	"name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"		"name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
	}		}
	],		],
			"mainline-postsubmit": [
			{
			"name": "NetworkStackIntegrationTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
			}
			],
	"imports": [		"imports": [
	{		{
	"path": "packages/modules/Connectivity"		"path": "packages/modules/Connectivity"

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@ public abstract class CaptivePortalDataShimImpl implements CaptivePortalDataShim
	}		}

	@Override		@Override
	public String getVenueFriendlyName() {		public CharSequence getVenueFriendlyName() {
	// Not supported in API level 29		// Not supported in API level 29
	return null;		return null;
	}		}