Merge "Add TEST_MAPPING for network policy related logic." (f4963395) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -365,7 +365,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		"com.android.server.net.action.SNOOZE_RAPID";

		/**
		* Indicates the maximum wait time for admin data to be available;
		* Indicates the maximum wait time for admin data to be available.
		*/
		private static final long WAIT_FOR_ADMIN_DATA_TIMEOUT_MS = 10_000;

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "CtsHostsideNetworkTests",
		"file_patterns": ["(/\|^)NetworkPolicy[^/]*\\.java"],
		"options": [
		{
		"include-filter": "com.android.cts.net.HostsideRestrictBackgroundNetworkTests"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "FrameworksServicesTests",
		"file_patterns": ["(/\|^)NetworkPolicy[^/]*\\.java"],
		"options": [
		{
		"include-filter": "com.android.server.net."
		},
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		]
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@ import android.os.RemoteException;
		import android.os.SimpleClock;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.platform.test.annotations.Presubmit;
		import android.telephony.CarrierConfigManager;
		import android.telephony.SubscriptionManager;
		import android.telephony.SubscriptionPlan;
		@@ -196,6 +197,7 @@ import java.util.stream.Collectors;
		*/
		@RunWith(AndroidJUnit4.class)
		@MediumTest
		@Presubmit
		public class NetworkPolicyManagerServiceTest {
		private static final String TAG = "NetworkPolicyManagerServiceTest";