Snap for 7357916 from 2de36c0540cc011dd10e616df5daf96c5f89507e to mainline-tethering-release (6d46371a) · Commits · e / os / android_packages_modules_NetworkStack

.gitignore

0 → 100644

+7 −0

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

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,9 @@ java_library {
		],
		sdk_version: "system_30",
		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
		@@ -217,6 +220,9 @@ android_library {
		"//packages/modules/NetworkStack/tests/unit",
		"//packages/modules/NetworkStack/tests/integration",
		],
		lint: {
		baseline_filename: "lint-baseline-current-lib.xml",
		},
		}

		android_library {
		@@ -235,6 +241,9 @@ android_library {
		"//packages/modules/NetworkStack/tests/unit",
		"//packages/modules/NetworkStack/tests/integration",
		],
		lint: {
		baseline_filename: "lint-baseline-stable-lib.xml",
		},
		}

		filegroup {

+8 −3

Original line number	Diff line number	Diff line
		@@ -5,14 +5,14 @@
		},
		{
		"name": "NetworkStackNextTests"
		},
		{
		"name": "NetworkStackIntegrationTests"
		}
		],
		"postsubmit": [
		{
		"name": "NetworkStackHostTests"
		},
		{
		"name": "NetworkStackIntegrationTests"
		}
		],
		"auto-postsubmit": [
		@@ -43,6 +43,11 @@
		"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": [
		{
		"path": "packages/modules/Connectivity"

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ public class ConnectivityManagerShimImpl implements ConnectivityManagerShim {
		*/
		@Override
		public void requestBackgroundNetwork(@NonNull NetworkRequest request,
		@NonNull Handler handler, @NonNull NetworkCallback networkCallback)
		@NonNull NetworkCallback networkCallback, @NonNull Handler handler)
		throws UnsupportedApiLevelException {
		// Not supported for API 29.
		throw new UnsupportedApiLevelException("Not supported in API 29.");

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ public class ConnectivityManagerShimImpl
		*/
		@Override
		public void requestBackgroundNetwork(@NonNull NetworkRequest request,
		@NonNull Handler handler, @NonNull NetworkCallback networkCallback)
		@NonNull NetworkCallback networkCallback, @NonNull Handler handler)
		throws UnsupportedApiLevelException {
		// Not supported for API 30.
		throw new UnsupportedApiLevelException("Not supported in API 30.");