Snap for 7211676 from da628091e7586c6667b7764f46737f02817e9f46 to mainline-tethering-release (60ae20f2) · Commits · e / os / android_packages_modules_NetworkStack

TEST_MAPPING

+20 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,26 @@
		"name": "NetworkStackIntegrationTests"
		}
		],
		"auto-postsubmit": [
		// Test tag for automotive targets. These are only running in postsubmit so as to harden the
		// automotive targets to avoid introducing additional test flake and build time. The plan for
		// presubmit testing for auto is to augment the existing tests to cover auto use cases as well.
		// Additionally, this tag is used in targeted test suites to limit resource usage on the test
		// infra during the hardening phase.
		// TODO: this tag to be removed once the above is no longer an issue.
		{
		"name": "NetworkStackTests"
		},
		{
		"name": "NetworkStackNextTests"
		},
		{
		"name": "NetworkStackHostTests"
		},
		{
		"name": "NetworkStackIntegrationTests"
		}
		],
		"mainline-presubmit": [
		// These are unit tests only, so they don't actually require any modules to be installed.
		// We must specify at least one module here or the tests won't run. Use the same set as CTS

+1 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.net.NetworkRequest;
		import android.os.Handler;

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

		import com.android.networkstack.apishim.common.ConnectivityManagerShim;
		import com.android.networkstack.apishim.common.UnsupportedApiLevelException;
		@@ -45,7 +44,7 @@ public class ConnectivityManagerShimImpl implements ConnectivityManagerShim {
		*/
		@Override
		public void requestBackgroundNetwork(@NonNull NetworkRequest request,
		@Nullable Handler handler, @NonNull NetworkCallback networkCallback)
		@NonNull Handler handler, @NonNull NetworkCallback networkCallback)
		throws UnsupportedApiLevelException {
		// Not supported for API 29.
		throw new UnsupportedApiLevelException("Not supported in API 29.");

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.os.Build;
		import android.os.Handler;

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

		import com.android.networkstack.apishim.common.ConnectivityManagerShim;
		import com.android.networkstack.apishim.common.ShimUtils;
		@@ -55,7 +54,7 @@ public class ConnectivityManagerShimImpl
		*/
		@Override
		public void requestBackgroundNetwork(@NonNull NetworkRequest request,
		@Nullable Handler handler, @NonNull NetworkCallback networkCallback)
		@NonNull Handler handler, @NonNull NetworkCallback networkCallback)
		throws UnsupportedApiLevelException {
		// Not supported for API 30.
		throw new UnsupportedApiLevelException("Not supported in API 30.");

+1 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.os.Build;
		import android.os.Handler;

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

		import com.android.networkstack.apishim.common.ConnectivityManagerShim;
		import com.android.networkstack.apishim.common.ShimUtils;
		@@ -57,7 +56,7 @@ public class ConnectivityManagerShimImpl
		*/
		@Override
		public void requestBackgroundNetwork(@NonNull NetworkRequest request,
		@Nullable Handler handler, @NonNull NetworkCallback networkCallback) {
		@NonNull Handler handler, @NonNull NetworkCallback networkCallback) {
		mCm.requestBackgroundNetwork(request, handler, networkCallback);
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@ import android.net.NetworkRequest;
		import android.os.Handler;

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


		/**
		* Interface used to access API methods in {@link android.net.ConnectivityManager}, with
		@@ -36,7 +34,7 @@ import androidx.annotation.Nullable;
		public interface ConnectivityManagerShim {
		/** See android.net.ConnectivityManager#requestBackgroundNetwork */
		void requestBackgroundNetwork(@NonNull NetworkRequest request,
		@Nullable Handler handler, @NonNull NetworkCallback networkCallback)
		@NonNull Handler handler, @NonNull NetworkCallback networkCallback)
		throws UnsupportedApiLevelException;

		/** See android.net.ConnectivityManager#registerSystemDefaultNetworkCallback */