Snap for 7910331 from 181ee419d1648ff51162518fa11173e45905dd6c to mainline-neuralnetworks-release (e8d22d60) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+11 −9

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"
		@@ -119,7 +119,7 @@ java_library {
		sdk_version: "system_30",
		visibility: ["//visibility:private"],
		lint: {
		baseline_filename: "lint-baseline-api-30-shims.xml",
		strict_updatability_linting: true,
		},
		}

		@@ -214,8 +214,10 @@ java_defaults {
		libs: ["unsupportedappusage"],
		static_libs: [
		"androidx.annotation_annotation",
		"modules-utils-build_system",
		"modules-utils-preconditions",
		"modules-utils-statemachine",
		"netd_aidl_interface-lateststable-java",
		"netlink-client",
		"networkstack-client",
		"net-utils-framework-common",
		// See note on statsprotos when adding/updating proto build rules
		@@ -223,6 +225,7 @@ java_defaults {
		"statsprotos",
		"captiveportal-lib",
		"net-utils-device-common",
		"net-utils-device-common-netlink",
		],
		plugins: ["java_api_finder"],
		}
		@@ -244,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 {
		@@ -267,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 {
		@@ -278,6 +277,7 @@ filegroup {
		visibility: [
		"//packages/modules/NetworkStack/tests/unit",
		"//packages/modules/NetworkStack/tests/integration",
		"//packages/modules/Connectivity/tests:__subpackages__",
		"//packages/modules/Connectivity/Tethering/tests/integration",
		]
		}
		@@ -337,6 +337,7 @@ android_app {
		"NetworkPermissionConfig",
		"privapp_whitelist_com.android.networkstack",
		],
		lint: { strict_updatability_linting: true },
		}

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

		cc_library_shared {

AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		android:sharedUserId="android.uid.networkstack"
		android:versionCode="319999900"
		android:versionName="s_aml_319999900"
		coreApp="true"
		>
		<!-- Permissions must be defined here, and not in the base manifest, as the network stack
		running in the system server process does not need any permission, and having privileged

AndroidManifest_InProcess.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.networkstack.inprocess"
		android:sharedUserId="android.uid.system"
		android:process="system">
		android:process="system"
		coreApp="true">
		<application>
		<service android:name="com.android.server.NetworkStackService"
		android:process="system"

AndroidManifest_Next.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,5 +18,6 @@
		package="com.android.networkstack"
		android:sharedUserId="android.uid.networkstack"
		android:versionCode="320000000"
		android:versionName="T-next">
		android:versionName="T-next"
		coreApp="true">
		</manifest>

TEST_MAPPING

+1 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,7 @@
		// We must specify at least one module here or the tests won't run. Use the same set as CTS
		// so in theory the infra would not need to reinstall/reboot devices to run both.
		{
		// TODO: add back tethering when it is updatable in this branch
		"name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]"
		"name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
		}
		],
		"mainline-postsubmit": [